[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  56ffe75 waf: Build pam_smbpass module only if enabled.
       via  17c22a1 s3fs-smbd: Make sure the registry is set up before we init printing.
      from  c4cb4c4 docs: Remove duplicate synonym min protocol.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 56ffe755f788fb225eb695343fa6ec47f6729ead
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 2 14:25:40 2012 +0200

    waf: Build pam_smbpass module only if enabled.
    
    (cherry picked from commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11)
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Fix bug #9244 - The option --with-pam_smbpass doens't work.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Thu Oct  4 18:50:33 CEST 2012 on sn-devel-104

commit 17c22a120c7abe34f59a5b9c61d77a9009e687b2
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 2 15:51:08 2012 +0200

    s3fs-smbd: Make sure the registry is set up before we init printing.
    
    (cherry picked from commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01)
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Fix bug #9245 - Printing backend is initialized before the winreg pipe is set
    up.

-----------------------------------------------------------------------

Summary of changes:
 source3/pam_smbpass/wscript_build |    3 ++-
 source3/smbd/server.c             |    8 ++++----
 source3/wscript                   |    3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 70b21d5..a2a2d01 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
                 LIBNTLMSSP LIBTSOCKET''',
         cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
         realname='pam_smbpass.so',
-        install_path='${PAMMODULESDIR}'
+        install_path='${PAMMODULESDIR}',
+        enabled=bld.env.with_pam_smbpass
         )
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 90bbb62..7dad13b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1471,6 +1471,10 @@ extern void build_options(bool screen);
 		}
 	}
 
+	if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
+		exit(1);
+	}
+
 	/* only start other daemons if we are running as a daemon
 	 * -- bad things will happen if smbd is launched via inetd
 	 *  and we fork a copy of ourselves here */
@@ -1495,10 +1499,6 @@ extern void build_options(bool screen);
 		}
 	}
 
-	if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
-		exit(1);
-	}
-
 	if (!is_daemon) {
 		int sock;
 
diff --git a/source3/wscript b/source3/wscript
index 18f84f8..2662edd 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -754,6 +754,9 @@ int i; i = PAM_RADIO_TYPE;
             conf.DEFINE('WITH_PAM', 1)
             conf.DEFINE('WITH_PAM_MODULES', 1)
 
+    if Options.options.with_pam_smbpass:
+        conf.env.with_pam_smbpass = True
+
     seteuid = False
 
 #


-- 
Samba Shared Repository