[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Oct 4 04:07:03 MDT 2012
The branch, master has been updated
via 50de2c9 s3fs-smbd: Make sure the registry is set up before we init printing.
via fb3cf6c waf: Build pam_smbpass module only if enabled.
from 100d38d tdb: add -e option to tdbdump (and docment it).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01
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.
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Oct 4 12:06:29 CEST 2012 on sn-devel-104
commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11
Author: Andreas Schneider <asn at samba.org>
Date: Tue Oct 2 14:25:40 2012 +0200
waf: Build pam_smbpass module only if enabled.
-----------------------------------------------------------------------
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 765f761..e4898ef 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -762,6 +762,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
More information about the samba-cvs
mailing list