svn commit: samba r24621 - in branches/SAMBA_3_2/source: nmbd
nsswitch smbd
metze at samba.org
metze at samba.org
Wed Aug 22 12:06:30 GMT 2007
Author: metze
Date: 2007-08-22 12:06:27 +0000 (Wed, 22 Aug 2007)
New Revision: 24621
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24621
Log:
- deferr calling build_options();exit(0);
- use poptPrintUsage() to give the user more info
metze
Modified:
branches/SAMBA_3_2/source/nmbd/nmbd.c
branches/SAMBA_3_2/source/nsswitch/winbindd.c
branches/SAMBA_3_2/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_2/source/nmbd/nmbd.c
===================================================================
--- branches/SAMBA_3_2/source/nmbd/nmbd.c 2007-08-22 12:04:42 UTC (rev 24620)
+++ branches/SAMBA_3_2/source/nmbd/nmbd.c 2007-08-22 12:06:27 UTC (rev 24621)
@@ -678,8 +678,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
default:
- d_fprintf(stderr, "\nInvalid option %s: %s\n",
+ d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
};
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:04:42 UTC (rev 24620)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd.c 2007-08-22 12:06:27 UTC (rev 24621)
@@ -1017,8 +1017,9 @@
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
default:
- d_fprintf(stderr, "\nInvalid option %s: %s\n",
+ d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
@@ -1036,6 +1037,8 @@
exit(1);
}
+ poptFreeContext(pc);
+
if (!override_logfile) {
pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
lp_set_logfile(logfile);
@@ -1167,8 +1170,6 @@
messaging_register(winbind_messaging_context(), NULL,
MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
- poptFreeContext(pc);
-
netsamlogon_cache_init(); /* Non-critical */
/* clear the cached list of trusted domains */
Modified: branches/SAMBA_3_2/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/server.c 2007-08-22 12:04:42 UTC (rev 24620)
+++ branches/SAMBA_3_2/source/smbd/server.c 2007-08-22 12:06:27 UTC (rev 24621)
@@ -818,6 +818,7 @@
const char *profile_level = NULL;
int opt;
poptContext pc;
+ BOOL print_build_options = False;
enum smb_server_mode server_mode = SERVER_MODE_DAEMON;
@@ -849,21 +850,25 @@
#endif
pc = poptGetContext("smbd", argc, argv, long_options, 0);
-
while((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case 'b':
- build_options(True); /* Display output to screen as well as debug */
- exit(0);
+ print_build_options = True;
+ break;
default:
- d_fprintf(stderr, "\nInvalid option %s: %s\n",
+ d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
poptBadOption(pc, 0), poptStrerror(opt));
+ poptPrintUsage(pc, stderr, 0);
exit(1);
}
}
-
poptFreeContext(pc);
+ if (print_build_options) {
+ build_options(True); /* Display output to screen as well as debug */
+ exit(0);
+ }
+
#ifdef HAVE_SETLUID
/* needed for SecureWare on SCO */
setluid(0);
More information about the samba-cvs
mailing list