The branch, master has been updated
via 1413af9 s3-waf: add --with-pam_smbpass configure option.
via 7bc381b s3-waf: move HAVE_LDAP_SASL_WRAPPING define to the
HAVE_LDAP block.
via 4562a79 s3:net Find uid before using it
from 717beda s4-smbtorture: more torture_fail usage in raw.write test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1413af95fc1512adb62e4295b029d9248d94683d
Author: Günther Deschner <[email protected]>
Date: Thu Mar 17 14:07:50 2011 +0100
s3-waf: add --with-pam_smbpass configure option.
We build pam_smbpass independent from this configure option though.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Thu Mar 17 14:52:33 CET 2011 on sn-devel-104
commit 7bc381bdc57681b0822f3af22945b8bec3941ce7
Author: Günther Deschner <[email protected]>
Date: Thu Mar 17 14:05:48 2011 +0100
s3-waf: move HAVE_LDAP_SASL_WRAPPING define to the HAVE_LDAP block.
Guenther
commit 4562a7914d432fd4aff7255697246290d55c847b
Author: Sumit Bose <[email protected]>
Date: Thu Mar 17 12:35:35 2011 +0100
s3:net Find uid before using it
Signed-off-by: Günther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/utils/net_sam.c | 14 +++++++-------
source3/wscript | 11 ++++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 8a9ca8a..af8aaa4 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1781,6 +1781,13 @@ doma_done:
"Admins group not available!\n"));
goto done;
}
+ if (!winbind_allocate_uid(&uid)) {
+ d_fprintf(stderr,
+ _("Unable to allocate a new uid to create "
+ "the Administrator user!\n"));
+ goto done;
+ }
+
name = talloc_strdup(tc, "Administrator");
dn = talloc_asprintf(tc, "uid=Administrator,%s",
lp_ldap_user_suffix());
uidstr = talloc_asprintf(tc, "%u", (unsigned int)uid);
@@ -1801,13 +1808,6 @@ doma_done:
sid_compose(&sid, get_global_sam_sid(),
DOMAIN_RID_ADMINISTRATOR);
- if (!winbind_allocate_uid(&uid)) {
- d_fprintf(stderr,
- _("Unable to allocate a new uid to create "
- "the Administrator user!\n"));
- goto done;
- }
-
smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass",
LDAP_OBJ_ACCOUNT);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass",
LDAP_OBJ_POSIXACCOUNT);
smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass",
LDAP_OBJ_SAMBASAMACCOUNT);
diff --git a/source3/wscript b/source3/wscript
index 508f270..c9ee928 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -46,6 +46,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable",
without_name="disable")
opt.SAMBA3_ADD_OPTION('pam')
+ opt.SAMBA3_ADD_OPTION('pam_smbpass')
opt.SAMBA3_ADD_OPTION('quotas')
opt.SAMBA3_ADD_OPTION('sys-quotas')
opt.SAMBA3_ADD_OPTION('sendfile-support')
@@ -560,11 +561,6 @@ msg.msg_acctrightslen = sizeof(fd);
conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
- # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can
add
- # SASL wrapping hooks
- if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
- conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
- conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
# if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print
it out
# for the samba logs
@@ -588,6 +584,11 @@ msg.msg_acctrightslen = sizeof(fd);
conf.DEFINE('HAVE_LDAP', '1')
conf.DEFINE('LDAP_DEPRECATED', '1')
conf.env['HAVE_LDAP'] = '1'
+ # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we
can add
+ # SASL wrapping hooks
+ if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
+ conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
+ conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
else:
conf.SET_TARGET_TYPE('ldap', 'EMPTY')
conf.SET_TARGET_TYPE('lber', 'EMPTY')
--
Samba Shared Repository
