passdb.c

server.c: Moved generate_machine_sid() into passdb.c for Jean-Francois
          (who might want an LDAP version). Changed locking to free exclusive
          lock as soon as possible to prevent contention.
lib/rpc/parse/parse_samr.c
lib/rpc/server/srv_samr.c: Changed last SID-as-string manipulation
                           function to use DOM_SID structure.
Jeremy.
(This used to be commit 3b8f5aef57b4f37265c0403385053085f0df6f18)

1 files changed, 2 insertions, 181 deletions

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f277bea421..9821b305bc 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -62,8 +62,8 @@ extern int dcelogin_atmost_once;
 /*
  * This is set on startup - it defines the SID for this
  * machine.
-*/
-DOM_SID global_machine_sid;
+ */
+extern DOM_SID global_machine_sid;
 
 connection_struct Connections[MAX_CONNECTIONS];
 files_struct Files[MAX_OPEN_FILES];
@@ -142,185 +142,6 @@ void  killkids(void)
 }
 
 /****************************************************************************
- Read the machine SID from a file.
-****************************************************************************/
-
-static BOOL read_sid_from_file(int fd, char *sid_file)
-{
-  fstring fline;
-
-  if(read(fd, &fline, sizeof(fline) -1 ) < 0) {
-    DEBUG(0,("read_sid_from_file: unable to read file %s. Error was %s\n",
-           sid_file, strerror(errno) ));
-    return False;
-  }
-
-  /*
-   * Convert to the machine SID.
-   */
-
-  fline[sizeof(fline)-1] = '\0';
-  if(!string_to_sid( &global_machine_sid, fline)) {
-    DEBUG(0,("read_sid_from_file: unable to generate machine SID.\n"));
-    return False;
-  }
-
-  return True;
-}
-
-/****************************************************************************
- Generate the global machine sid. Look for the MACHINE.SID file first, if
- not found then look in smb.conf and use it to create the MACHINE.SID file.
-****************************************************************************/
-
-static BOOL generate_machine_sid(void)
-{
-  int fd;
-  char *p;
-  pstring sid_file;
-  fstring sid_string;
-  struct stat st;
-  uchar raw_sid_data[12];
-
-  pstrcpy(sid_file, lp_smb_passwd_file());
-  p = strrchr(sid_file, '/');
-  if(p != NULL)
-    *++p = '\0';
-
-  pstrcat(sid_file, "MACHINE.SID");
-
-  if((fd = open( sid_file, O_RDWR | O_CREAT, 0644)) < 0 ) {
-    DEBUG(0,("generate_machine_sid: unable to open or create file %s. Error was %s\n",
-             sid_file, strerror(errno) ));
-    return False;
-  }
-
-  /*
-   * Check if the file contains data.
-   */
-
-  if(fstat( fd, &st) < 0) {
-    DEBUG(0,("generate_machine_sid: unable to stat file %s. Error was %s\n",
-             sid_file, strerror(errno) ));
-    close(fd);
-    return False;
-  }
-
-  if(st.st_size > 0) {
-    /*
-     * We have a valid SID - read it.
-     */
-    if(!read_sid_from_file( fd, sid_file)) {
-      DEBUG(0,("generate_machine_sid: unable to read file %s. Error was %s\n",
-             sid_file, strerror(errno) )); 
-      close(fd);
-      return False;
-    }
-    close(fd);
-    return True;
-  }
-
-  /*
-   * The file contains no data - we may need to generate our
-   * own sid. Try the lp_domain_sid() first.
-   */
-
-  if(*lp_domain_sid())
-    fstrcpy( sid_string, lp_domain_sid());
-  else {
-    /*
-     * Generate the new sid data & turn it into a string.
-     */
-    int i;
-    generate_random_buffer( raw_sid_data, 12, True);
-
-    fstrcpy( sid_string, "S-1-5-21");
-    for( i = 0; i < 3; i++) {
-      fstring tmp_string;
-      slprintf( tmp_string, sizeof(tmp_string) - 1, "-%u", IVAL(raw_sid_data, i*4));
-      fstrcat( sid_string, tmp_string);
-    }
-  }
-
-  fstrcat(sid_string, "\n");
-
-  /*
-   * Ensure our new SID is valid.
-   */
-
-  if(!string_to_sid( &global_machine_sid, sid_string)) {
-    DEBUG(0,("generate_machine_sid: unable to generate machine SID.\n"));
-    return False;
-  }
-
-  /*
-   * Do an exclusive blocking lock on the file.
-   */
-
-  if(!do_file_lock( fd, 60, F_WRLCK)) {
-    DEBUG(0,("generate_machine_sid: unable to lock file %s. Error was %s\n",
-             sid_file, strerror(errno) ));
-    close(fd);
-    return False;
-  }
-
-  /*
-   * At this point we have a blocking lock on the SID 
-   * file - check if in the meantime someone else wrote
-   * SID data into the file. If so - they were here first,
-   * use their data.
-   */
-
-  if(fstat( fd, &st) < 0) {
-    DEBUG(0,("generate_machine_sid: unable to stat file %s. Error was %s\n",
-             sid_file, strerror(errno) ));
-    close(fd);
-    return False;
-  }
-
-  if(st.st_size > 0) {
-    /*
-     * We have a valid SID - read it.
-     */
-    if(!read_sid_from_file( fd, sid_file)) {
-      DEBUG(0,("generate_machine_sid: unable to read file %s. Error was %s\n",
-             sid_file, strerror(errno) ));
-      close(fd);
-      return False;
-    } 
-    close(fd);
-    return True;
-  }   
-
-  /*
-   * The file is still empty and we have an exlusive lock on it.
-   * Write out out SID data into the file.
-   */
-
-  if(fchmod(fd, 0644) < 0) {
-    DEBUG(0,("generate_machine_sid: unable to set correct permissions on file %s. \
-Error was %s\n", sid_file, strerror(errno) ));
-    close(fd);
-    return False;
-  }
-
-  if(write( fd, sid_string, strlen(sid_string)) != strlen(sid_string)) {
-    DEBUG(0,("generate_machine_sid: unable to write file %s. Error was %s\n",
-          sid_file, strerror(errno) ));
-    close(fd);
-    return False;
-  }
- 
-  /*
-   * Unlock & exit.
-   */
- 
-  do_file_lock( fd, 60, F_UNLCK);
-  close(fd);
-  return True;
-}
-
-/****************************************************************************
   change a dos mode to a unix mode
     base permission for files:
          everybody gets read bit set