1 files changed, 67 insertions, 26 deletions

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index cd72a4f572..3b91f2d6af 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -5,7 +5,6 @@
 
    Copyright (C) by Tim Potter 2000-2002
    Copyright (C) Andrew Tridgell 2002
-   Copyright (C) Jelmer Vernooij 2003
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,6 +31,7 @@ BOOL opt_dual_daemon = False;
 static BOOL reload_services_file(BOOL test)
 {
 	BOOL ret;
+	pstring logfile;
 
 	if (lp_loaded()) {
 		pstring fname;
@@ -43,9 +43,15 @@ static BOOL reload_services_file(BOOL test)
 		}
 	}
 
+	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
+	lp_set_logfile(logfile);
+
 	reopen_logs();
 	ret = lp_load(dyn_CONFIGFILE,False,False,True);
 
+	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
+	lp_set_logfile(logfile);
+
 	reopen_logs();
 	load_interfaces();
 
@@ -806,23 +812,27 @@ BOOL winbind_setup_common(void)
 
 struct winbindd_state server_state;   /* Server state information */
 
-int main(int argc, char **argv)
+
+static void usage(void)
 {
+	printf("Usage: winbindd [options]\n");
+        printf("\t-F                daemon in foreground mode\n");
+        printf("\t-S                log to stdout\n");
+	printf("\t-i                interactive mode\n");
+	printf("\t-B                dual daemon mode\n");
+	printf("\t-n                disable cacheing\n");
+	printf("\t-d level          set debug level\n");
+	printf("\t-s configfile     choose smb.conf location\n");
+	printf("\t-h                show this help message\n");
+}
+
+ int main(int argc, char **argv)
+{
+	extern BOOL AllowDebugChange;
 	pstring logfile;
-	static BOOL interactive = False;
-	static BOOL Fork = True;
-	static BOOL log_stdout = False;
-	struct poptOption long_options[] = {
-		POPT_AUTOHELP
-		{ "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
-		{ "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Daemon in foreground mode" },
-		{ "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" },
-		{ "dual-daemon", 'B', POPT_ARG_VAL, &opt_dual_daemon, True, "Dual daemon mode" },
-		{ "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" },
-		POPT_COMMON_SAMBA
-		POPT_TABLEEND
-	};
-	poptContext pc;
+	BOOL interactive = False;
+	BOOL Fork = True;
+	BOOL log_stdout = False;
 	int opt;
 
 	/* glibc (?) likes to print "User defined signal 1" and exit if a
@@ -833,12 +843,13 @@ int main(int argc, char **argv)
 
 	fault_setup((void (*)(void *))fault_quit );
 
+	snprintf(logfile, sizeof(logfile), "%s/log.winbindd", dyn_LOGFILEBASE);
+	lp_set_logfile(logfile);
+
 	/* Initialise for running in non-root mode */
 
 	sec_init();
 
-	set_remote_machine_name("winbindd", False);
-
 	/* Set environment variable so we don't recursively call ourselves.
 	   This may also be useful interactively. */
 
@@ -846,24 +857,56 @@ int main(int argc, char **argv)
 
 	/* Initialise samba/rpc client stuff */
 
-	pc = poptGetContext("winbindd", argc, (const char **)argv, long_options,
-						POPT_CONTEXT_KEEP_FIRST);
-
-	while ((opt = poptGetNextOpt(pc)) != -1) {
+	while ((opt = getopt(argc, argv, "FSid:s:nhB")) != EOF) {
 		switch (opt) {
+
+		case 'F':
+			Fork = False;
+			break;
+		case 'S':
+			log_stdout = True;
+			break;
 			/* Don't become a daemon */
 		case 'i':
 			interactive = True;
 			log_stdout = True;
 			Fork = False;
 			break;
+
+			/* dual daemon system */
+		case 'B':
+			opt_dual_daemon = True;
+			break;
+
+			/* disable cacheing */
+		case 'n':
+			opt_nocache = True;
+			break;
+
+			/* Run with specified debug level */
+		case 'd':
+			DEBUGLEVEL = atoi(optarg);
+			AllowDebugChange = False;
+			break;
+
+			/* Load a different smb.conf file */
+		case 's':
+			pstrcpy(dyn_CONFIGFILE,optarg);
+			break;
+
+		case 'h':
+			usage();
+			exit(0);
+
+		default:
+			printf("Unknown option %c\n", (char)opt);
+			exit(1);
 		}
 	}
 
-
 	if (log_stdout && Fork) {
 		printf("Can't log to stdout (-S) unless daemon is in foreground +(-F) or interactive (-i)\n");
-		poptPrintUsage(pc, stderr, 0);
+		usage();
 		exit(1);
 	}
 
@@ -914,7 +957,6 @@ int main(int argc, char **argv)
 		DEBUG(0, ("unable to initialise messaging system\n"));
 		exit(1);
 	}
-	poptFreeContext(pc);
 
 	register_msg_pool_usage();
 	message_register(MSG_REQ_TALLOC_USAGE, return_all_talloc_info);
@@ -923,7 +965,6 @@ int main(int argc, char **argv)
 
 	process_loop();
 
-	trustdom_cache_shutdown();
 	uni_group_cache_shutdown();
 	return 0;
 }