[SCM] Samba Shared Repository - branch master updated

2012-10-18 Thread Karolin Seeger 
The branch, master has been updated
   via  bea7a25 build: Assert that auth_domain, auth_builtin, auth_sam, 
auth_winbind are builtin
   via  7786919 BUG #9295: Build standard auth modules as internal modules.
  from  64886e3 Warn when setting UID/GID without idmap_ldb:use rfc2307 = 
Yes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit bea7a251781c65a87af6c6e1568cb71a5aef3f7f
Author: Andrew Bartlett 
Date:   Thu Oct 18 19:58:04 2012 +1100

build: Assert that auth_domain, auth_builtin, auth_sam, auth_winbind are 
builtin

These modules are used by default and for various reasons cannot be 
compiled into a .so

The code setting up these lists is generic, so it is easier to just assert 
early,
for this non-default configuration.

Andrew Bartlett

Signed-off-by: Andreas Schneider 

Address bug #9295 - Can't find guest.so module if auth_builtin is built as
module.

Autobuild-User(master): Karolin Seeger 
Autobuild-Date(master): Thu Oct 18 13:14:38 CEST 2012 on sn-devel-104

commit 7786919428527f8e3b75806f5058ddd2a6ad4fab
Author: Andreas Schneider 
Date:   Wed Oct 17 16:30:57 2012 +0200

BUG #9295: Build standard auth modules as internal modules.

Signed-off-by: Andreas Schneider 

---

Summary of changes:
 source3/auth/wscript_build |   12 
 source3/wscript|6 ++
 2 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 8a535cb..e518de9 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -40,8 +40,7 @@ bld.SAMBA3_MODULE('auth_sam',
  source=AUTH_SAM_SRC,
  deps='samba-util',
  init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
+ internal_module=True)
 
 bld.SAMBA3_MODULE('auth_unix',
  subsystem='auth',
@@ -56,8 +55,7 @@ bld.SAMBA3_MODULE('auth_winbind',
  source=AUTH_WINBIND_SRC,
  deps='samba-util',
  init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
+ internal_module=True)
 
 bld.SAMBA3_MODULE('auth_wbc',
  subsystem='auth',
@@ -72,16 +70,14 @@ bld.SAMBA3_MODULE('auth_domain',
  source=AUTH_DOMAIN_SRC,
  deps='RPC_CLIENT_SCHANNEL trusts_util',
  init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
+ internal_module=True)
 
 bld.SAMBA3_MODULE('auth_builtin',
  subsystem='auth',
  source=AUTH_BUILTIN_SRC,
  deps='samba-util',
  init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
+ internal_module=True)
 
 bld.SAMBA3_MODULE('auth_script',
  subsystem='auth',
diff --git a/source3/wscript b/source3/wscript
index 11ef767..3874df5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1617,6 +1617,12 @@ main() {
 final_static_modules.remove(m)
 final_shared_modules.append(m)
 
+if ("auth_domain" not in final_static_modules) or \
+("auth_builtin" not in final_static_modules) or \
+("auth_sam" not in final_static_modules) or \
+("auth_winbind" not in final_static_modules):
+raise Utils.WafError('These auth modules MUST be configured as static 
modules: auth_domain, auth_builtin, auth_sam, auth_winbind')
+
 conf.env['static_modules'] = final_static_modules
 conf.env['shared_modules'] = final_shared_modules
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-5-test updated

2012-10-18 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  fce3a18 Revert "s3-smbd: Don't segfault if user specified ports out 
for range."
  from  31518a6 s3: fix compile of krb5 locator on Solaris

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


- Log -
commit fce3a18d3d5ed46f8e0d1653f862e46b5dff0e03
Author: Karolin Seeger 
Date:   Thu Oct 18 11:48:16 2012 +0200

Revert "s3-smbd: Don't segfault if user specified ports out for range."

This reverts commit 60b15f3b646d10e027e8288132db5b942261de8f.

This commit seems to break 'make test' on my system, so reverting it for 
now.
(Bug report has been re-opened, see
https://bugzilla.samba.org/show_bug.cgi?id=9218
for details).

---

Summary of changes:
 source3/smbd/server.c |   23 +++
 1 files changed, 11 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f34d9f6..63a9869 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -560,8 +560,6 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
int num_interfaces = iface_count();
int i;
char *ports;
-   char *tok;
-   const char *ptr;
unsigned dns_port = 0;
 
 #ifdef HAVE_ATEXIT
@@ -583,16 +581,6 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
ports = talloc_strdup(talloc_tos(), smb_ports);
}
 
-   for (ptr = ports;
-next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
-   unsigned port = atoi(tok);
-
-   if (port == 0 || port > 0x) {
-   exit_server_cleanly("Invalid port in the config or on "
-   "the commandline specified!");
-   }
-   }
-
if (lp_interfaces() && lp_bind_interfaces_only()) {
/* We have been given an interfaces line, and been
   told to only bind to those interfaces. Create a
@@ -604,6 +592,8 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
for(i = 0; i < num_interfaces; i++) {
const struct sockaddr_storage *ifss =
iface_n_sockaddr_storage(i);
+   char *tok;
+   const char *ptr;
 
if (ifss == NULL) {
DEBUG(0,("open_sockets_smbd: "
@@ -615,6 +605,9 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
for (ptr=ports;
 next_token_talloc(talloc_tos(),&ptr, &tok, " 
\t,");) {
unsigned port = atoi(tok);
+   if (port == 0 || port > 0x) {
+   continue;
+   }
 
/* Keep the first port for mDNS service
 * registration.
@@ -632,6 +625,8 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
/* Just bind to 0.0.0.0 - accept connections
   from anywhere. */
 
+   char *tok;
+   const char *ptr;
const char *sock_addr = lp_socket_address();
char *sock_tok;
const char *sock_ptr;
@@ -649,7 +644,11 @@ static bool open_sockets_smbd(struct smbd_parent_context 
*parent,
 next_token_talloc(talloc_tos(), &sock_ptr, &sock_tok, " 
\t,"); ) {
for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, 
&tok, " \t,"); ) {
struct sockaddr_storage ss;
+
unsigned port = atoi(tok);
+   if (port == 0 || port > 0x) {
+   continue;
+   }
 
/* Keep the first port for mDNS service
 * registration.


-- 
Samba Shared Repository

Re: [SCM] CTDB repository - branch master updated - ctdb-1.13-290-gaf540ef

2012-10-18 Thread Michael Adam 
Gosh, I messed up the commit message. :-o
The diff is correct, though ... ;-)

Michael

Michael Adam wrote:
> The branch, master has been updated
>via  af540ef728303b4a0a188b17c695e9aefab34489 (commit)
>   from  25d886060b138bc5e78fe93d7bebe3990264f29d (commit)
> 
> http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
> 
> 
> - Log -
> commit af540ef728303b4a0a188b17c695e9aefab34489
> Author: Michael Adam 
> Date:   Wed Oct 17 14:21:33 2012 +0200
> 
> config/functions: fix a comment
> 
> ctdb_check_counter_limits does not fail but succeed if count >= limit
> 
> Signed-off-by: Michael Adam 
> 
> ---
> 
> Summary of changes:
>  config/functions |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/config/functions b/config/functions
> index 32c6f4a..5a86882 100755
> --- a/config/functions
> +++ b/config/functions
> @@ -929,7 +929,7 @@ delete_ip_from_iface()
>  # usage: ctdb_counter_init
>  #ctdb_counter_incr
>  #ctdb_check_counter_limit 
> -# ctdb_check_counter_limit succeeds when count >= 
> +# ctdb_check_counter_limit fails when count >= 
>  
>  _ctdb_counter_common () {
>  _service_name="${1:-${service_name}}"
> 
> 
> -- 
> CTDB repository


pgpzKmAnjgw8f.pgp
Description: PGP signature

[SCM] CTDB repository - branch master updated - ctdb-1.13-290-gaf540ef

2012-10-18 Thread Michael Adam 
The branch, master has been updated
   via  af540ef728303b4a0a188b17c695e9aefab34489 (commit)
  from  25d886060b138bc5e78fe93d7bebe3990264f29d (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -
commit af540ef728303b4a0a188b17c695e9aefab34489
Author: Michael Adam 
Date:   Wed Oct 17 14:21:33 2012 +0200

config/functions: fix a comment

ctdb_check_counter_limits does not fail but succeed if count >= limit

Signed-off-by: Michael Adam 

---

Summary of changes:
 config/functions |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/functions b/config/functions
index 32c6f4a..5a86882 100755
--- a/config/functions
+++ b/config/functions
@@ -929,7 +929,7 @@ delete_ip_from_iface()
 # usage: ctdb_counter_init
 #ctdb_counter_incr
 #ctdb_check_counter_limit 
-# ctdb_check_counter_limit succeeds when count >= 
+# ctdb_check_counter_limit fails when count >= 
 
 _ctdb_counter_common () {
 _service_name="${1:-${service_name}}"


-- 
CTDB repository

[SCM] Samba Shared Repository - branch master updated

2012-10-18 Thread Andrew Bartlett 
The branch, master has been updated
   via  64886e3 Warn when setting UID/GID without idmap_ldb:use rfc2307 = 
Yes
   via  071047e Tests for 'samba-tool user create' with RFC2307 attributes
   via  bfdaaf2 Set RFC2307 attributes in samba-tool create
   via  9eb022c provision: No longer use the wheel group in new AD Domains
  from  b557f34 s3:smbd: fix brace placements in 
validate_my_share_entries() for readability

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 64886e312fe76145c2c4bc900b794274594368aa
Author: Alexander Wuerstlein 
Date:   Sun Sep 30 04:32:01 2012 +0200

Warn when setting UID/GID without idmap_ldb:use rfc2307 = Yes

Signed-off-by: Andrew Bartlett 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Oct 18 09:51:35 CEST 2012 on sn-devel-104

commit 071047e8953f36a4c71c30d9540323578a4204f2
Author: Alexander Wuerstlein 
Date:   Sun Sep 30 04:32:00 2012 +0200

Tests for 'samba-tool user create' with RFC2307 attributes

Check if attributes are correctly set and read from SamDB
Test automatic creation of attributes from getpwent (NSS)
Check if overriding NSS attributes works

getpwent will be skipped if the current UID of the user running the
tests has no passwd entry (getpwuid(geteuid())).

If a user with the name of the current UID already exists in the
directory, the getpwent test will fail. If that should happen, the
test would need to be updated to use a nonexistent UID that is
visible to the Python 'pwd' module.

Signed-off-by: Andrew Bartlett 

commit bfdaaf2327441c0cf909a70f9b3ca781caadbddc
Author: Alexander Wuerstlein 
Date:   Sun Sep 30 04:31:59 2012 +0200

Set RFC2307 attributes in samba-tool create

Optionally set RFC2307 (NIS Schema) attributes in samba-tool create.
Mainly needed for UID mapping to be usable.
Not all attributes are set-able, only harmless and non-overlapping
ones (uid, uidNumber, gidNumber, loginShell, gecos). Description and
homeDirectory should already be set, userPassword seems problematic.

Signed-off-by: Andrew Bartlett 

commit 9eb022c8c65663425e60a10a12c2ec52c3017a59
Author: Andrew Bartlett 
Date:   Tue Oct 16 13:08:22 2012 +1100

provision: No longer use the wheel group in new AD Domains

The issue here is that if we set S-1-5-32-544 (administrators) to a
GID only, then users cannot force a mandetory profile to be owned by
administrators (which is a requirement).

There is no particularly useful reason for us to enforce this matching
a system group.

Andrew Bartlett

---

Summary of changes:
 source4/scripting/bin/samba_upgradedns |2 +-
 source4/scripting/python/samba/netcmd/domain.py|5 +-
 source4/scripting/python/samba/netcmd/user.py  |   39 +-
 .../scripting/python/samba/provision/__init__.py   |   39 +++---
 source4/scripting/python/samba/samdb.py|   26 -
 source4/scripting/python/samba/tests/posixacl.py   |8 +-
 .../python/samba/tests/samba_tool/base.py  |6 +
 .../python/samba/tests/samba_tool/user.py  |  141 ++-
 source4/scripting/python/samba/upgrade.py  |2 +-
 source4/scripting/python/samba/upgradehelpers.py   |4 +-
 10 files changed, 230 insertions(+), 42 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_upgradedns 
b/source4/scripting/bin/samba_upgradedns
index 8304134..ba597cf 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -91,7 +91,7 @@ def fix_names(pnames):
 names.domaindn = pnames.domaindn[0]
 names.configdn = pnames.configdn[0]
 names.schemadn = pnames.schemadn[0]
-names.wheel_gid = pnames.wheel_gid[0]
+names.root_gid = pnames.root_gid
 names.serverdn = str(pnames.serverdn)
 return names
 
diff --git a/source4/scripting/python/samba/netcmd/domain.py 
b/source4/scripting/python/samba/netcmd/domain.py
index 6e3f35a..4ba305c 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -186,8 +186,6 @@ class cmd_domain_provision(Command):
 help="choose 'root' unix username"),
  Option("--nobody", type="string", metavar="USERNAME",
 help="choose 'nobody' user"),
- Option("--wheel", type="string", metavar="GROUPNAME",
-help="choose 'wheel' privileged group"),
  Option("--users", type="string", metavar="GROUPNAME",
 help="choose 'users' group"),
  Option("--quiet", help="Be quiet", action="store_true"),
@@ -237,7 +235,6 @@ class cmd_domain_provision(Command):
 ldapadminpass=None,
 root=None,

[SCM] Samba Shared Repository - branch v3-5-test updated

2012-10-18 Thread Karolin Seeger 
The branch, v3-5-test has been updated
   via  31518a6 s3: fix compile of krb5 locator on Solaris
  from  ee5a100 lib-addns: ensure that allocated buffer are pre set to 0 
(bug #9259)

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


- Log -
commit 31518a6acd3399a29499b5f758e36115cf3db78b
Author: Björn Jacke 
Date:   Tue May 29 08:01:40 2012 +0200

s3: fix compile of krb5 locator on Solaris

the krb5 locator plugin on Solaris needs LIBREPLACE_LIBS (bug #8732)

Autobuild-User: Björn Jacke 
Autobuild-Date: Tue May 29 09:58:42 CEST 2012 on sn-devel-104
(cherry picked from commit 3085225e72c75abf84d7740334459cd971ee4c56)
(cherry picked from commit 7ca265423a36c114ac9216a780e005956967eae7)

---

Summary of changes:
 source3/Makefile.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d1a8780..aebfc3b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2547,7 +2547,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB)
 bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) 
$(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT)
@echo "Linking $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) 
$(LIBWBCLIENT_LIBS) $(KRB5LIBS) \
-   @SONAMEFLAG@`basename $@`
+   $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@`
 
 bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) 
$(LIBWBCLIENT)
@echo "Linking shared library $@"


-- 
Samba Shared Repository