svn commit: samba r24624 - in branches/SAMBA_3_2_0/source/nsswitch: .

[metze at samba.org]

Author: metze
Date: 2007-08-22 12:23:18 +0000 (Wed, 22 Aug 2007)
New Revision: 24624

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24624

Log:
add '-D' option to winbindd as we no longer ignore
unknown options.

forbit: '-D -i' together

metze
Modified:
   branches/SAMBA_3_2_0/source/nsswitch/winbindd.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd.c	2007-08-22 12:21:40 UTC (rev 24623)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd.c	2007-08-22 12:23:18 UTC (rev 24624)
@@ -932,6 +932,7 @@
 int main(int argc, char **argv, char **envp)
 {
 	pstring logfile;
+	static BOOL is_daemon = False;
 	static BOOL Fork = True;
 	static BOOL log_stdout = False;
 	static BOOL no_process_group = False;
@@ -940,6 +941,7 @@
 		{ "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
 		{ "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Daemon in foreground mode" },
 		{ "no-process-group", 0, POPT_ARG_VAL, &no_process_group, True, "Don't create a new process group" },
+		{ "daemon", 'D', POPT_ARG_NONE, NULL, 'D', "Become a daemon (default)" },
 		{ "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" },
 		{ "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, True, "Disable caching" },
 		POPT_COMMON_SAMBA
@@ -980,6 +982,9 @@
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 			/* Don't become a daemon */
+		case 'D':
+			is_daemon = True;
+			break;
 		case 'i':
 			interactive = True;
 			log_stdout = True;
@@ -993,8 +998,16 @@
 		}
 	}
 
+	if (is_daemon && interactive) {
+		d_fprintf(stderr,"\nERROR: "
+			  "Option -i|--interactive is not allowed together with -D|--daemon\n\n");
+		poptPrintUsage(pc, stderr, 0);
+		exit(1);
+	}
+
 	if (log_stdout && Fork) {
-		printf("Can't log to stdout (-S) unless daemon is in foreground +(-F) or interactive (-i)\n");
+		d_fprintf(stderr, "\nERROR: "
+			  "Can't log to stdout (-S) unless daemon is in foreground +(-F) or interactive (-i)\n\n");
 		poptPrintUsage(pc, stderr, 0);
 		exit(1);
 	}