From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 25 May 2004 17:42:06 +0000 (+0000)
Subject: remove '-S'; improve usage()
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~325
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=06782dac3bab158838920005b11373554a3655fd;p=openldap

remove '-S'; improve usage()
---

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 7cd20669e6..3fe61d6c07 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -190,14 +190,14 @@ usage( char *name )
 		"\t-l facility\tSyslog facility (default: LOCAL4)\n"
 #endif
 		"\t-n serverName\tService name\n"
-		"\t-o <opt>[=val]\tGeneric means to specify options; details in slapd(8)\n"
+		"\t-o <opt>[=val]\tGeneric means to specify options; supported options:\n"
+#ifdef HAVE_SLP
+		"\t\t\t\tslp[={on|off}]\n"
+#endif
 #ifdef HAVE_CHROOT
 		"\t-r directory\tSandbox directory to chroot to\n"
 #endif
 		"\t-s level\tSyslog level\n"
-#ifdef HAVE_SLP
-		"\t-S enable SLP registration\n"
-#endif
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
 		"\t-u user\t\tUser (id or name) to run as\n"
 #endif
@@ -425,14 +425,6 @@ int main( int argc, char **argv )
 			ldap_syslog = atoi( optarg );
 			break;
 
-		case 'S':	/* enable SLP */
-#ifdef HAVE_SLP
-			slapd_register_slp++;
-#else
-			fputs( "slapd: SLP support is not available\n", stderr );
-#endif
-			break;
-
 #ifdef LOG_LOCAL4
 		case 'l':	/* set syslog local user */
 			syslogUser = cnvt_str2int( optarg,