From ca84693b125502fea1462007ba13b2cf47565a30 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 29 Nov 2002 02:49:11 +0000 Subject: [PATCH] Clean up error messages --- clients/tools/ldapcompare.c | 14 +++++++------- clients/tools/ldapdelete.c | 14 +++++++------- clients/tools/ldapmodify.c | 14 +++++++------- clients/tools/ldapmodrdn.c | 14 +++++++------- clients/tools/ldappasswd.c | 12 ++++++------ clients/tools/ldapsearch.c | 6 +++--- clients/tools/ldapwhoami.c | 14 +++++++------- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c index 1dedf90ed5..5286e156e9 100644 --- a/clients/tools/ldapcompare.c +++ b/clients/tools/ldapcompare.c @@ -200,16 +200,16 @@ main( int argc, char **argv ) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -220,11 +220,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -234,11 +234,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( noop ) { - fprintf( stderr, "noop control previously specified"); + fprintf( stderr, "noop control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index a326248a04..8a1b2e37b3 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -199,16 +199,16 @@ main( int argc, char **argv ) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -219,11 +219,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -233,11 +233,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( noop ) { - fprintf( stderr, "noop control previously specified"); + fprintf( stderr, "noop control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 8d4a25da10..cddbf8192e 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -263,16 +263,16 @@ main( int argc, char **argv ) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -283,11 +283,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -297,11 +297,11 @@ main( int argc, char **argv ) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( noop ) { - fprintf( stderr, "noop control previously specified"); + fprintf( stderr, "noop control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index e2052ca01f..4b1de065c5 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -219,16 +219,16 @@ main(int argc, char **argv) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -239,11 +239,11 @@ main(int argc, char **argv) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -253,11 +253,11 @@ main(int argc, char **argv) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( noop ) { - fprintf( stderr, "noop control previously specified"); + fprintf( stderr, "noop control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index bb3536f227..d9d20554a8 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -219,16 +219,16 @@ main( int argc, char *argv[] ) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -239,11 +239,11 @@ main( int argc, char *argv[] ) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -253,7 +253,7 @@ main( int argc, char *argv[] ) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 2011f89612..42b3ffffdc 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -310,7 +310,7 @@ main( int argc, char **argv ) if ( strcasecmp( control, "mv" ) == 0 ) { /* ValuesReturnFilter control */ if( valuesReturnFilter ) { - fprintf( stderr, "ValuesReturnFilter previously specified"); + fprintf( stderr, "ValuesReturnFilter previously specified\n"); return EXIT_FAILURE; } valuesReturnFilter= 1 + crit; @@ -329,7 +329,7 @@ main( int argc, char **argv ) int num, tmp; /* PagedResults control */ if ( pagedResults != 0 ) { - fprintf( stderr, "PagedResultsControl previously specified" ); + fprintf( stderr, "PagedResultsControl previously specified\n" ); return EXIT_FAILURE; } @@ -346,7 +346,7 @@ main( int argc, char **argv ) #ifdef LDAP_CONTROL_SUBENTRIES } else if ( strcasecmp( control, "subentries" ) == 0 ) { if( subentries ) { - fprintf( stderr, "subentries control previously specified"); + fprintf( stderr, "subentries control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL || strcasecmp( cvalue, "true") == 0 ) { diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c index 182cfa40a6..a770c015ba 100644 --- a/clients/tools/ldapwhoami.c +++ b/clients/tools/ldapwhoami.c @@ -175,16 +175,16 @@ main( int argc, char *argv[] ) if ( strcasecmp( control, "authzid" ) == 0 ) { if( authzid != NULL ) { - fprintf( stderr, "authzid control previously specified"); + fprintf( stderr, "authzid control previously specified\n"); return EXIT_FAILURE; } if( cvalue == NULL ) { - fprintf( stderr, "authzid: control value expected" ); + fprintf( stderr, "authzid: control value expected\n" ); usage(prog); return EXIT_FAILURE; } if( !crit ) { - fprintf( stderr, "authzid: must be marked critical" ); + fprintf( stderr, "authzid: must be marked critical\n" ); usage(prog); return EXIT_FAILURE; } @@ -195,11 +195,11 @@ main( int argc, char *argv[] ) } else if ( strcasecmp( control, "manageDSAit" ) == 0 ) { if( manageDSAit ) { - fprintf( stderr, "manageDSAit control previously specified"); + fprintf( stderr, "manageDSAit control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "manageDSAit: no control value expected" ); + fprintf( stderr, "manageDSAit: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } @@ -209,11 +209,11 @@ main( int argc, char *argv[] ) } else if ( strcasecmp( control, "noop" ) == 0 ) { if( noop ) { - fprintf( stderr, "noop control previously specified"); + fprintf( stderr, "noop control previously specified\n"); return EXIT_FAILURE; } if( cvalue != NULL ) { - fprintf( stderr, "noop: no control value expected" ); + fprintf( stderr, "noop: no control value expected\n" ); usage(prog); return EXIT_FAILURE; } -- 2.39.5