This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[ira/wip.git] / source3 / smbd / server.c

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 6296e13f1cd908aed54654b0ee8eafaba4ab2e89..c759f56e0cb34aa78dbf03e22ae811ab040eb7b7 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -53,7 +53,7 @@ int smbd_server_fd(void)
        return server_fd;
 }
 
-static void smbd_set_server_fd(int fd)
+void smbd_set_server_fd(int fd)
 {
        server_fd = fd;
        client_setfd(fd);
@@ -782,6 +782,15 @@ static void usage(char *pname)
        }
 #endif
 
+#ifdef WITH_SSL
+       {
+               extern BOOL sslEnabled;
+               sslEnabled = lp_ssl_enabled();
+               if(sslEnabled)
+                       sslutil_init(True);
+       }
+#endif        /* WITH_SSL */
+
        fstrcpy(global_myworkgroup, lp_workgroup());
 
        DEBUG(3,( "loaded services\n"));
@@ -860,7 +869,7 @@ static void usage(char *pname)
        /* possibly reload the services file. */
        reload_services(True);
 
-       if(!get_global_sam_sid()) {
+       if(!pdb_generate_sam_sid()) {
                DEBUG(0,("ERROR: Samba cannot create a SAM SID.\n"));
                exit(1);
        }