Add -e authzid argument processing

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index fe0e33f8081b6c3c66aca6119a7a6ce80347ffad..a326248a0474fc4d7765c0559ac079da0ea3634b 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -197,7 +197,27 @@ main( int argc, char **argv )
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index adf04033068e65d22a2fd0f4a77bd0bc1de5c7cb..8d4a25da10ae74c2e21796a3084690334426b414 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -261,7 +261,27 @@ main( int argc, char **argv )
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 60fd986adbc5531d1f43998ac778577c0711db97..e2052ca01f8b6a98a0dc021983a89f854d3693ba 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -217,7 +217,27 @@ main(int argc, char **argv)
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 4d3bfb29fc2b5c669a733718195facff835f2b17..bb3536f22729d6b1f7f707c089fe7a7a3c863192 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -217,7 +217,27 @@ main( int argc, char *argv[] )
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 5ad8b5610e8761f4c738aaa5f0a1fc5964500efe..2011f8961236877d6127b81787604e4dcbe02b1e 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -454,7 +454,27 @@ main( int argc, char **argv )
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index 37289e6235cbf98e70633e1f88a2e12473ca9dc8..182cfa40a6b5b986d91033954fa2561c5ae68a3e 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -173,7 +173,27 @@ main( int argc, char *argv[] )
                        *cvalue++ = '\0';
                }
 
-               if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
+               if ( strcasecmp( control, "authzid" ) == 0 ) {
+                       if( authzid != NULL ) {
+                               fprintf( stderr, "authzid control previously specified");
+                               return EXIT_FAILURE;
+                       }
+                       if( cvalue == NULL ) {
+                               fprintf( stderr, "authzid: control value expected" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+                       if( !crit ) {
+                               fprintf( stderr, "authzid: must be marked critical" );
+                               usage(prog);
+                               return EXIT_FAILURE;
+                       }
+
+                       assert( authzid == NULL );
+                       authzid = control;
+                       break;
+                       
+               } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
                        if( manageDSAit ) {
                                fprintf( stderr, "manageDSAit control previously specified");
                                return EXIT_FAILURE;