From fbd17c8dafeefac788f4bc1c41045726825f513f Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Mon, 3 Jan 2000 19:19:48 +0000
Subject: simple mods to add msrpc pipe redirection.  default behaviour: fall
 back to using internal msrpc code in smbd. (This used to be commit
 8976e26d46cb991710bc77463f7f928ac00dd4d8)

---
 source3/smbd/server.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'source3/smbd/server.c')

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0d45f11693..716f555c65 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -501,6 +501,8 @@ static void usage(char *pname)
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
+	fstring sam_name;
+
 	extern BOOL append_log;
 	/* shall I run as a daemon */
 	BOOL is_daemon = False;
@@ -680,11 +682,6 @@ static void usage(char *pname)
 
 	fstrcpy(global_myworkgroup, lp_workgroup());
 
-	if(!pdb_generate_sam_sid()) {
-		DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
-		exit(1);
-	}
-
 	CatchSignal(SIGHUP,SIGNAL_CAST sig_hup);
 	
 	/* Setup the signals that allow the debug log level
@@ -734,7 +731,23 @@ static void usage(char *pname)
 
 	/* possibly reload the services file. */
 	reload_services(True);
-	
+
+	/* obtain or create a SAM SID */
+	if (lp_domain_logons())
+	{
+		fstrcpy(sam_name, global_myworkgroup);
+	}
+	else
+	{
+		fstrcpy(sam_name, global_myname);
+	}
+
+	if(!pdb_generate_sam_sid(sam_name, NULL))
+	{
+		DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
+		exit(1);
+	}
+
 	if (*lp_rootdir()) {
 		if (sys_chroot(lp_rootdir()) == 0)
 			DEBUG(2,("Changed root to %s\n", lp_rootdir()));
-- 
cgit