Roll back to using static MACHINE.SID after consultation with Andrew. This

code will be removed soon and a SID auto-generated from (probably) primary
hostname and never stored in a file will replace it.
Jeremy.
(This used to be commit fbfe94a799cda7f728bc920d4f0655d4f537e3b6)

1 files changed, 1 insertions, 14 deletions

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 576f6d14d2..00ea801cca 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -530,8 +530,6 @@ 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;
@@ -766,18 +764,7 @@ 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))
-	{
+	if(!pdb_generate_sam_sid()) {
 		DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
 		exit(1);
 	}