svn commit: samba r25303 - in branches/SAMBA_4_0/source/setup: .

[abartlet]

Author: abartlet
Date: 2007-09-24 09:34:54 + (Mon, 24 Sep 2007)
New Revision: 25303

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25303

Log:
Print out the options the provision script generated.  This should
help users produce predictable setups.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/setup/provision


Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision
===
--- branches/SAMBA_4_0/source/setup/provision   2007-09-24 05:11:03 UTC (rev 
25302)
+++ branches/SAMBA_4_0/source/setup/provision   2007-09-24 09:34:54 UTC (rev 
25303)
@@ -14,7 +14,6 @@
'realm=s',
'domain=s',
'domain-guid=s',
-   'domain-guid=s',
'domain-sid=s',
'policy-guid=s',
'host-name=s',
@@ -169,6 +168,18 @@
 } else {
provision(subobj, message, blank, paths, system_session, creds, 
ldapbackend);
provision_dns(subobj, message, paths, system_session, creds);
+   message("To reproduce this provision, run with:\n");
+   message("--realm='" + subobj.REALM_CONF + "' --domain='" + 
subobj.DOMAIN_CONF + "' --domain-guid='" + subobj.DOMAINGUID + "' \\\n");
+   message("--policy-guid='" + subobj.POLICYGUID + "' --host-name='" + 
subobj.HOSTNAME + "' --host-ip='" + subobj.HOSTIP + "' \\\n");
+   message("--host-guid='" + subobj.HOSTGUID + "' --invocationid='" + 
subobj.INVOCATIONID + "' \\\n");
+   message("--adminpass='" + subobj.ADMINPASS + "' --krbtgtpass='" + 
subobj.KRBTGTPASS + "' \\\n");
+   message("--machinepass='" + subobj.MACHINEPASS + "' --dnspass='" + 
subobj.DNSPASS + "' \\\n");
+   message("--root='" + subobj.ROOT + "' --nobody='" + subobj.NOBODY + "' 
--nogroup-'" + subobj.NOGROUP + "' \\\n");
+   message("--wheel='" + subobj.WHEEL + "' --users='" + subobj.USERS + "' 
--server-role='" + subobj.SERVERROLE + "' \\\n");
+   message("--ldap-backend='" + subobj.LDAPBACKEND + "' --ldap-mdoule='" + 
subobj.LDAPMODULE + "' \\\n");
+   message("--aci='" + subobj.ACI + "' \\\n")
 }
+
+
 message("All OK\n");
 return 0;

Rev 633: upped version number in http://samba.org/~tridge/3_0-ctdb

[tridge]

revno: 633
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Mon 2007-09-24 15:27:37 +1000
message:
  upped version number
modified:
  packaging/RHEL4-CTDB/samba.spec samba.spec-20070530192107-og9sp62ho5xuaaer-4
=== modified file 'packaging/RHEL4-CTDB/samba.spec'
--- a/packaging/RHEL4-CTDB/samba.spec   2007-09-14 09:29:39 +
+++ b/packaging/RHEL4-CTDB/samba.spec   2007-09-24 05:27:37 +
@@ -6,7 +6,7 @@
 Packager: Samba Team <[EMAIL PROTECTED]>
 Name: samba
 Version:  3.0.25
-Release:  ctdb.3
+Release:  ctdb.4
 Epoch:0
 License: GNU GPL version 2
 Group: System Environment/Daemons

Rev 642: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge]

revno: 642
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-09-24 13:52:35 +1000
message:
  merge from ronnie
modified:
  server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1

revno: 432.1.297
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-09-24 10:52:26 +1000
message:
  when we have a public ip address mismatch (i.e. we hold addresses we 
  shouldnt   or we are not holding addresses wqe should)
  we must first freeze the local node before we set the recovery mode
modified:
  server/ctdb_recoverd.c 
recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1

revno: 432.1.296
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Mon 2007-09-24 10:27:48 +1000
message:
  merge from tridge
modified:
  config/ctdb.init   ctdb.init-20070527204758-biuh7znabuwan3zn-6
  config/ctdb.sysconfig  
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
  config/events.d/50.samba   samba-20070601105340-vlcvnp6euoj3zdwy-3
  config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
  include/ctdb_private.h 
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  server/ctdb_daemon.c   
ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  server/ctdb_monitor.c  
ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
  server/ctdb_persistent.c   
ctdb_persistent.c-20070920053845-u2ggm5relkdor3xg-1
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
  server/ctdb_server.c   ctdb.c-20061127094323-t50f58d65iaao5of-2
  server/ctdb_tunables.c 
ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1
  tests/ctdb_persistent.c
ctdb_persistent.c-20070921022331-6ubn98ak9nwbzjzv-1

revno: 432.1.295
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-09-21 15:45:48 +1000
message:
  merge from tridge
modified:
  server/ctdb_persistent.c   
ctdb_persistent.c-20070920053845-u2ggm5relkdor3xg-1
=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c2007-09-21 02:24:02 +
+++ b/server/ctdb_recoverd.c2007-09-24 00:52:26 +
@@ -1561,12 +1561,30 @@
if (ips->ips[j].pnn == pnn) {
if (!ctdb_sys_have_ip(ips->ips[j].sin)) {
DEBUG(0,("Public address '%s' is 
missing and we should serve this ip\n", inet_ntoa(ips->ips[j].sin.sin_addr)));
-   ctdb_ctrl_setrecmode(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, CTDB_RECOVERY_ACTIVE);
+   ret = ctdb_ctrl_freeze(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE);
+   if (ret != 0) {
+   DEBUG(0,(__location__ " Failed 
to freeze node due to public ip address mismatches\n"));
+   goto again;
+   }
+   ret = ctdb_ctrl_setrecmode(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, CTDB_RECOVERY_ACTIVE);
+   if (ret != 0) {
+   DEBUG(0,(__location__ " Failed 
to activate recovery mode due to public ip address mismatches\n"));
+   goto again;
+   }
}
} else {
if (ctdb_sys_have_ip(ips->ips[j].sin)) {
DEBUG(0,("We are still serving a public 
address '%s' that we should not be serving.\n", 
inet_ntoa(ips->ips[j].sin.sin_addr)));
-   ctdb_ctrl_setrecmode(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, CTDB_RECOVERY_ACTIVE);
+   ret = ctdb_ctrl_freeze(ctdb, 
CONTROL_TIMEOUT(), CTDB_CURRENT_NODE);
+   if (ret != 0) {
+   DEBUG(0,(__location__ " Failed 
to freeze node due to public ip address mismatches\n"));
+  

Rev 643: upped version number in http://samba.org/~tridge/ctdb

[tridge]

revno: 643
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Mon 2007-09-24 15:27:01 +1000
message:
  upped version number
modified:
  packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec   2007-09-14 09:27:11 +
+++ b/packaging/RPM/ctdb.spec   2007-09-24 05:27:01 +
@@ -5,7 +5,7 @@
 Packager: Samba Team <[EMAIL PROTECTED]>
 Name: ctdb
 Version: 1.0
-Release: 10
+Release: 11
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons

Rev 632: set result->persistent before we change tdb_flags in http://samba.org/~tridge/3_0-ctdb

[tridge]

revno: 632
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Mon 2007-09-24 13:53:40 +1000
message:
  set result->persistent before we change tdb_flags
modified:
  source/lib/dbwrap_ctdb.c   dbwrap_ctdb.c-20070415131935-89u7zduywa3g216g-1
=== modified file 'source/lib/dbwrap_ctdb.c'
--- a/source/lib/dbwrap_ctdb.c  2007-09-21 06:04:09 +
+++ b/source/lib/dbwrap_ctdb.c  2007-09-24 03:53:40 +
@@ -414,6 +414,8 @@
 
db_path = ctdbd_dbpath(db_ctdb, db_ctdb->db_id);
 
+   result->persistent = ((tdb_flags & TDB_CLEAR_IF_FIRST) == 0);
+
/* only pass through specific flags */
tdb_flags &= TDB_SEQNUM;
 
@@ -431,7 +433,6 @@
result->traverse = db_ctdb_traverse;
result->traverse_read = db_ctdb_traverse_read;
result->get_seqnum = db_ctdb_get_seqnum;
-   result->persistent = ((tdb_flags & TDB_CLEAR_IF_FIRST) == 0);
 
DEBUG(3,("db_open_ctdb: opened database '%s' with dbid 0x%x\n",
 name, db_ctdb->db_id));

svn commit: samba r25304 - in branches/SAMBA_4_0/source/scripting/libjs: .

[abartlet]

Author: abartlet
Date: 2007-09-24 11:34:26 + (Mon, 24 Sep 2007)
New Revision: 25304

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25304

Log:
Thankyou to Amin Azez <[EMAIL PROTECTED]> for pointing out that I
used subobj.ROLE and not subobj.SERVERROLE as the rest of the code
does.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-09-24 
09:34:54 UTC (rev 25303)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js  2007-09-24 
11:34:26 UTC (rev 25304)
@@ -585,12 +585,12 @@
var st = sys.stat(paths.smbconf);
if (st == undefined) {
var smbconfsuffix;
-   if (subobj.ROLE == "domain controller") {
+   if (subobj.SERVERROLE == "domain controller") {
smbconfsuffix = "dc";
-   } else if (subobj.ROLE == "member server") {
+   } else if (subobj.SERVERROLE == "member server") {
smbconfsuffix = "member";
} else {
-   smbconfsuffix = subobj.ROLE;
+   smbconfsuffix = subobj.SERVERROLE;
}
message("Setting up " + paths.smbconf +"\n");
setup_file("provision.smb.conf." + smbconfsuffix, info.message, 
paths.smbconf, subobj);

svn commit: samba r25305 - in branches/SAMBA_4_0: . source/libcli

[jelmer]

Author: jelmer
Date: 2007-09-24 13:22:30 + (Mon, 24 Sep 2007)
New Revision: 25305

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25305

Log:
Fix installation of missing headers.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/libcli/config.mk


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-09-24 11:34:26 UTC (rev 25304)
+++ branches/SAMBA_4_0/.bzrignore   2007-09-24 13:22:30 UTC (rev 25305)
@@ -198,3 +198,5 @@
 source/librpc/ndr/ndr_table.h
 test-results
 source/lib/ldb-samba/ldif_handlers.h
+rpc_server/lsa/proto.h
+torture/winbind/proto.h

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===
--- branches/SAMBA_4_0/source/libcli/config.mk  2007-09-24 11:34:26 UTC (rev 
25304)
+++ branches/SAMBA_4_0/source/libcli/config.mk  2007-09-24 13:22:30 UTC (rev 
25305)
@@ -3,10 +3,10 @@
 include security/config.mk
 
 [SUBSYSTEM::LIBSAMBA-ERRORS]
-PUBLIC_HEADERS = util/error.h util/nterr.h util/doserr.h util/nt_status.h
+PUBLIC_HEADERS = util/error.h util/ntstatus.h util/doserr.h util/werror.h
 OBJ_FILES = util/doserr.o \
-   util/errormap.o \
-   util/nterr.o \
+   util/errormap.o \
+   util/nterr.o \
 
 [SUBSYSTEM::ASN1_UTIL]
 PUBLIC_PROTO_HEADER = util/asn1_proto.h

svn commit: samba r25306 - in branches/SAMBA_4_0: . source/lib/util source/lib/util/tests source/torture/local

[jelmer]

Author: jelmer
Date: 2007-09-24 15:55:26 + (Mon, 24 Sep 2007)
New Revision: 25306

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25306

Log:
Add tests for string_sub().
Added:
   branches/SAMBA_4_0/source/lib/util/tests/str.c
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/.bzrignore
   branches/SAMBA_4_0/source/lib/util/tests/file.c
   branches/SAMBA_4_0/source/lib/util/util_str.c
   branches/SAMBA_4_0/source/torture/local/config.mk
   branches/SAMBA_4_0/source/torture/local/local.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore   2007-09-24 13:22:30 UTC (rev 25305)
+++ branches/SAMBA_4_0/.bzrignore   2007-09-24 15:55:26 UTC (rev 25306)
@@ -200,3 +200,5 @@
 source/lib/ldb-samba/ldif_handlers.h
 rpc_server/lsa/proto.h
 torture/winbind/proto.h
+source/rpc_server/lsa/proto.h
+source/torture/winbind/proto.h

Modified: branches/SAMBA_4_0/source/lib/util/tests/file.c
===
--- branches/SAMBA_4_0/source/lib/util/tests/file.c 2007-09-24 13:22:30 UTC 
(rev 25305)
+++ branches/SAMBA_4_0/source/lib/util/tests/file.c 2007-09-24 15:55:26 UTC 
(rev 25306)
@@ -88,10 +88,10 @@
struct torture_suite *suite = torture_suite_create(mem_ctx, "FILE");
 
torture_suite_add_simple_test(suite, "file_load_save", 
-  
test_file_load_save);
+ test_file_load_save);
 
torture_suite_add_simple_test(suite, "afdgets", 
-  
test_afdgets);
+ test_afdgets);
 
return suite;
 }

Added: branches/SAMBA_4_0/source/lib/util/tests/str.c
===
--- branches/SAMBA_4_0/source/lib/util/tests/str.c  2007-09-24 13:22:30 UTC 
(rev 25305)
+++ branches/SAMBA_4_0/source/lib/util/tests/str.c  2007-09-24 15:55:26 UTC 
(rev 25306)
@@ -0,0 +1,78 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   util_str testing
+
+   Copyright (C) Jelmer Vernooij <[EMAIL PROTECTED]> 2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .
+*/
+
+#include "includes.h"
+#include "torture/ui.h"
+
+static bool test_string_sub_simple(struct torture_context *tctx)
+{
+   char tmp[100];
+   safe_strcpy(tmp, "foobar", sizeof(tmp));
+   string_sub(tmp, "foo", "bar", sizeof(tmp));
+   torture_assert_str_equal(tctx, tmp, "barbar", "invalid sub");
+   return true;
+}
+
+static bool test_string_sub_multiple(struct torture_context *tctx)
+{
+   char tmp[100];
+   safe_strcpy(tmp, "fooblafoo", sizeof(tmp));
+   string_sub(tmp, "foo", "bar", sizeof(tmp));
+   torture_assert_str_equal(tctx, tmp, "barblabar", "invalid sub");
+   return true;
+}
+
+static bool test_string_sub_longer(struct torture_context *tctx)
+{
+   char tmp[100];
+   safe_strcpy(tmp, "foobla", sizeof(tmp));
+   string_sub(tmp, "foo", "blie", sizeof(tmp));
+   torture_assert_str_equal(tctx, tmp, "bliebla", "invalid sub");
+   return true;
+}
+
+static bool test_string_sub_shorter(struct torture_context *tctx)
+{
+   char tmp[100];
+   safe_strcpy(tmp, "foobla", sizeof(tmp));
+   string_sub(tmp, "foo", "bl", sizeof(tmp));
+   torture_assert_str_equal(tctx, tmp, "blbla", "invalid sub");
+   return true;
+}
+
+struct torture_suite *torture_local_util_str(TALLOC_CTX *mem_ctx)
+{
+   struct torture_suite *suite = torture_suite_create(mem_ctx, "STR");
+
+   torture_suite_add_simple_test(suite, "string_sub_simple", 
+ test_string_sub_simple);
+
+   torture_suite_add_simple_test(suite, "string_sub_multiple", 
+ test_string_sub_multiple);
+
+   torture_suite_add_simple_test(suite, "string_sub_shorter", 
+ test_string_sub_shorter);
+
+   torture_suite_add_simple_test(suite, "string_sub_longer",

svn commit: samba r25307 - in branches/SAMBA_4_0: . source/lib/util source/lib/util/tests

[jelmer]

Author: jelmer
Date: 2007-09-24 16:43:16 + (Mon, 24 Sep 2007)
New Revision: 25307

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25307

Log:
add string_sub_talloc.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/util/tests/str.c
   branches/SAMBA_4_0/source/lib/util/util.h
   branches/SAMBA_4_0/source/lib/util/util_str.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/lib/util/tests/str.c
===
--- branches/SAMBA_4_0/source/lib/util/tests/str.c  2007-09-24 15:55:26 UTC 
(rev 25306)
+++ branches/SAMBA_4_0/source/lib/util/tests/str.c  2007-09-24 16:43:16 UTC 
(rev 25307)
@@ -58,6 +58,40 @@
return true;
 }
 
+static bool test_string_sub_special_char(struct torture_context *tctx)
+{
+   char tmp[100];
+   safe_strcpy(tmp, "foobla", sizeof(tmp));
+   string_sub(tmp, "foo", "%b;l", sizeof(tmp));
+   torture_assert_str_equal(tctx, tmp, "_b_lbla", "invalid sub");
+   return true;
+}
+
+static bool test_string_sub_talloc_simple(struct torture_context *tctx)
+{
+   char *t;
+   
+   t = string_sub_talloc(tctx, "foobla", "foo", "bl");
+
+   torture_assert_str_equal(tctx, t, "blbla", "invalid sub");
+
+   return true;
+}
+
+static bool test_string_sub_talloc_multiple(struct torture_context *tctx)
+{
+   char *t;
+   
+   t = string_sub_talloc(tctx, "fooblafoo", "foo", "aapnootmies");
+
+   torture_assert_str_equal(tctx, t, "aapnootmiesblaaapnootmies", 
+"invalid sub");
+
+   return true;
+}
+
+
+
 struct torture_suite *torture_local_util_str(TALLOC_CTX *mem_ctx)
 {
struct torture_suite *suite = torture_suite_create(mem_ctx, "STR");
@@ -74,5 +108,14 @@
torture_suite_add_simple_test(suite, "string_sub_longer", 
  test_string_sub_longer);
 
+   torture_suite_add_simple_test(suite, "string_sub_special_chars", 
+ test_string_sub_special_char);
+
+   torture_suite_add_simple_test(suite, "string_sub_talloc_simple", 
+ test_string_sub_talloc_simple);
+
+   torture_suite_add_simple_test(suite, "string_sub_talloc_multiple", 
+ test_string_sub_talloc_multiple);
+
return suite;
 }

Modified: branches/SAMBA_4_0/source/lib/util/util.h
===
--- branches/SAMBA_4_0/source/lib/util/util.h   2007-09-24 15:55:26 UTC (rev 
25306)
+++ branches/SAMBA_4_0/source/lib/util/util.h   2007-09-24 16:43:16 UTC (rev 
25307)
@@ -383,6 +383,10 @@
 **/
 _PUBLIC_ void string_sub(char *s,const char *pattern, const char *insert, 
size_t len);
 
+
+_PUBLIC_ char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s, 
+   const char *pattern, const char *insert);
+
 /**
  Similar to string_sub() but allows for any character to be substituted. 
  Use with caution!

Modified: branches/SAMBA_4_0/source/lib/util/util_str.c
===
--- branches/SAMBA_4_0/source/lib/util/util_str.c   2007-09-24 15:55:26 UTC 
(rev 25306)
+++ branches/SAMBA_4_0/source/lib/util/util_str.c   2007-09-24 16:43:16 UTC 
(rev 25307)
@@ -317,7 +317,43 @@
}
 }
 
+/**
+ * Talloc'ed version of string_sub
+ */
+_PUBLIC_ char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s, 
+   const char *pattern, const char *insert)
+{
+   const char *p;
+   char *ret;
+   size_t len, alloc_len;
 
+   if (insert == NULL || pattern == NULL || !*pattern || s == NULL)
+   return NULL;
+
+   /* determine length needed */
+   len = strlen(s);
+   
+   for (p = strstr(s, pattern); p != NULL; 
+p = strstr(p+strlen(pattern), pattern)) {
+   len += strlen(insert) - strlen(pattern);
+   }
+
+   alloc_len = MAX(len, strlen(s))+1;
+   ret = talloc_array(mem_ctx, char, alloc_len);
+   if (ret == NULL)
+   return NULL;
+   strncpy(ret, s, alloc_len);
+   string_sub(ret, pattern, insert, alloc_len);
+
+   ret = talloc_realloc(mem_ctx, ret, char, len+1);
+   if (ret == NULL)
+   return NULL;
+
+   SMB_ASSERT(ret[len] == '\0');
+
+   return ret;
+}
+
 /**
  Similar to string_sub() but allows for any character to be substituted. 
  Use with caution!

svn commit: samba r25308 - in branches/SAMBA_4_0: . source/param

[jelmer]

Author: jelmer
Date: 2007-09-24 18:47:50 + (Mon, 24 Sep 2007)
New Revision: 25308

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25308

Log:
Remove use of pstring.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:

Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===
--- branches/SAMBA_4_0/source/param/loadparm.c  2007-09-24 16:43:16 UTC (rev 
25307)
+++ branches/SAMBA_4_0/source/param/loadparm.c  2007-09-24 18:47:50 UTC (rev 
25308)
@@ -63,7 +63,6 @@
 #include "lib/util/dlinklist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include "pstring.h"
 
 static bool bLoaded = false;
 
@@ -82,7 +81,7 @@
 /* 
  * This structure describes global (ie., server-wide) parameters.
  */
-struct global
+struct loadparm_global
 {
enum server_role server_role;
 
@@ -265,7 +264,7 @@
 
 /* local variables */
 static struct loadparm_context {
-   struct global Globals;
+   struct loadparm_global Globals;
struct loadparm_service **ServicePtrs;
int iNumServices;
struct loadparm_service *currentService;
@@ -1130,7 +1129,6 @@
 const char *user, const char *pszHomedir)
 {
struct loadparm_service *service;
-   pstring newHomedir;
 
service = add_a_service(lp_ctx, default_service, pszHomename);
 
@@ -1139,14 +1137,11 @@
 
if (!(*(default_service->szPath))
|| strequal(default_service->szPath, sDefault.szPath)) {
-   pstrcpy(newHomedir, pszHomedir);
+   service->szPath = talloc_strdup(service, pszHomedir);
} else {
-   pstrcpy(newHomedir, lp_pathname(default_service));
-   string_sub(newHomedir,"%H", pszHomedir, sizeof(newHomedir)); 
+   service->szPath = string_sub_talloc(service, 
lp_pathname(default_service),"%H", pszHomedir); 
}
 
-   string_set(service, &service->szPath, newHomedir);
-
if (!(*(service->comment))) {
service->comment = talloc_asprintf(service, "Home directory of 
%s", user);
}
@@ -1154,7 +1149,7 @@
service->bBrowseable = default_service->bBrowseable;
 
DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", 
- pszHomename, user, newHomedir));
+ pszHomename, user, service->szPath));

return true;
 }
@@ -2571,8 +2566,9 @@
 * The substitution here is used to support %U is
 * service names
 */
-   serviceName = 
standard_sub_basic(loadparm.ServicePtrs[iService],
-
loadparm.ServicePtrs[iService]->szService);
+   serviceName = standard_sub_basic(
+   loadparm.ServicePtrs[iService],
+   
loadparm.ServicePtrs[iService]->szService);
if (strequal(serviceName, service_name))
return loadparm.ServicePtrs[iService];
}

svn commit: samba r25309 - in branches: SAMBA_3_0_MAINT/source/smbd SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[jra]

Author: jra
Date: 2007-09-24 19:11:42 + (Mon, 24 Sep 2007)
New Revision: 25309

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25309

Log:
Volker's fix for bug #4984 - samba4 torture test
to follow. Ensure we don't prepend "./" as a root
directory - this is an invalid pathname for unix_convert().
Jeremy.

Modified:
   branches/SAMBA_3_0_MAINT/source/smbd/nttrans.c
   branches/SAMBA_3_2/source/smbd/nttrans.c
   branches/SAMBA_3_2_0/source/smbd/nttrans.c


Changeset:
Modified: branches/SAMBA_3_0_MAINT/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_MAINT/source/smbd/nttrans.c  2007-09-24 18:47:50 UTC 
(rev 25308)
+++ branches/SAMBA_3_0_MAINT/source/smbd/nttrans.c  2007-09-24 19:11:42 UTC 
(rev 25309)
@@ -543,7 +543,6 @@
 */
pstring rel_fname;
files_struct *dir_fsp = 
file_fsp(inbuf,smb_ntcreate_RootDirectoryFid);
-   size_t dir_name_len;
 
if(!dir_fsp) {
END_PROFILE(SMBntcreateX);
@@ -583,15 +582,18 @@
 */
 
pstrcpy( fname, dir_fsp->fsp_name );
-   dir_name_len = strlen(fname);
 
-   /*
-* Ensure it ends in a '\'.
-*/
+   if (ISDOT(fname)) {
+   fname[0] = '\0';
+   } else {
+   size_t dir_name_len = strlen(fname);
+   /*
+* Ensure it ends in a '\'.
+*/
 
-   if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != 
'/')) {
-   pstrcat(fname, "/");
-   dir_name_len++;
+   if((fname[dir_name_len-1] != '\\') && 
(fname[dir_name_len-1] != '/')) {
+   pstrcat(fname, "/");
+   }
}
 
srvstr_get_path(inbuf, rel_fname, smb_buf(inbuf), 
sizeof(rel_fname), 0, STR_TERMINATE, &status);
@@ -1244,7 +1246,6 @@
 * This filename is relative to a directory fid.
 */
files_struct *dir_fsp = file_fsp(params,4);
-   size_t dir_name_len;
 
if(!dir_fsp) {
return ERROR_DOS(ERRDOS,ERRbadfid);
@@ -1272,15 +1273,18 @@
 */
 
pstrcpy( fname, dir_fsp->fsp_name );
-   dir_name_len = strlen(fname);
 
-   /*
-* Ensure it ends in a '\'.
-*/
+if (ISDOT(fname)) {
+   fname[0] = '\0';
+   } else {
+   size_t dir_name_len = strlen(fname);
+   /*
+* Ensure it ends in a '\'.
+*/
 
-   if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != 
'/')) {
-   pstrcat(fname, "/");
-   dir_name_len++;
+   if((fname[dir_name_len-1] != '\\') && 
(fname[dir_name_len-1] != '/')) {
+   pstrcat(fname, "/");
+   }
}
 
{

Modified: branches/SAMBA_3_2/source/smbd/nttrans.c
===
--- branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-24 18:47:50 UTC (rev 
25308)
+++ branches/SAMBA_3_2/source/smbd/nttrans.c2007-09-24 19:11:42 UTC (rev 
25309)
@@ -586,7 +586,6 @@
char *rel_fname = NULL;
files_struct *dir_fsp = file_fsp(
SVAL(req->inbuf, smb_ntcreate_RootDirectoryFid));
-   size_t dir_name_len;
 
if(!dir_fsp) {
reply_doserror(req, ERRDOS, ERRbadfid);
@@ -629,29 +628,46 @@
return;
}
 
-   /*
-* Copy in the base directory name.
-*/
+   if (ISDOT(dir_fsp->fsp_name)) {
+   /*
+* We're at the toplevel dir, the final file name
+* must not contain ./, as this is filtered out
+* normally by srvstr_get_path and unix_convert
+* explicitly rejects paths containing ./.
+*/
+   fname = talloc_strdup(ctx,"");
+   if (!fname) {
+   reply_nterror(req, NT_STATUS_NO_MEMORY);
+   END_PROFILE(SMBntcreateX);
+   return;
+   }
+   } else {
+   size_t dir_name_len = strlen(dir_fsp->fsp_name);
 
-   dir_name_len = strlen(dir_fsp->fsp_name);
-   fname = TALLOC_ARRAY(ctx, char, dir_name_len+2);
-   if (!fname) {
-  

svn commit: samba r25310 - in branches/SAMBA_4_0/source/torture/raw: .

[vlendec]

Author: vlendec
Date: 2007-09-24 19:48:10 + (Mon, 24 Sep 2007)
New Revision: 25310

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25310

Log:
Make sure we do not regress on r25309
Modified:
   branches/SAMBA_4_0/source/torture/raw/raw.c
   branches/SAMBA_4_0/source/torture/raw/samba3misc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/raw.c
===
--- branches/SAMBA_4_0/source/torture/raw/raw.c 2007-09-24 19:11:42 UTC (rev 
25309)
+++ branches/SAMBA_4_0/source/torture/raw/raw.c 2007-09-24 19:48:10 UTC (rev 
25310)
@@ -63,6 +63,8 @@
torture_suite_add_1smb_test(suite, "COMPOSITE", torture_raw_composite);
torture_suite_add_simple_test(suite, "SAMBA3HIDE", torture_samba3_hide);
torture_suite_add_simple_test(suite, "SAMBA3CLOSEERR", 
torture_samba3_closeerr);
+   torture_suite_add_simple_test(suite, "SAMBA3ROOTDIRFID",
+ torture_samba3_rootdirfid);
torture_suite_add_simple_test(suite, "SAMBA3CHECKFSP", 
torture_samba3_checkfsp);
torture_suite_add_simple_test(suite, "SAMBA3BADPATH", 
torture_samba3_badpath);
torture_suite_add_simple_test(suite, "SAMBA3CASEINSENSITIVE",

Modified: branches/SAMBA_4_0/source/torture/raw/samba3misc.c
===
--- branches/SAMBA_4_0/source/torture/raw/samba3misc.c  2007-09-24 19:11:42 UTC 
(rev 25309)
+++ branches/SAMBA_4_0/source/torture/raw/samba3misc.c  2007-09-24 19:48:10 UTC 
(rev 25310)
@@ -817,3 +817,73 @@
smbcli_deltree(cli->tree, dirname);
return ret;
 }
+
+bool torture_samba3_rootdirfid(struct torture_context *tctx)
+{
+   struct smbcli_state *cli;
+   NTSTATUS status;
+   uint16_t dnum;
+   union smb_open io;
+   const char *fname = "testfile";
+   bool ret = false;
+
+   if (!torture_open_connection(&cli, 0)) {
+   ret = false;
+   goto done;
+   }
+
+   smbcli_unlink(cli->tree, fname);
+
+   io.generic.level = RAW_OPEN_NTCREATEX;
+   io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
+   io.ntcreatex.in.root_fid = 0;
+   io.ntcreatex.in.security_flags = 0;
+   io.ntcreatex.in.access_mask =
+   SEC_STD_SYNCHRONIZE | SEC_FILE_EXECUTE;
+   io.ntcreatex.in.alloc_size = 0;
+   io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY;
+   io.ntcreatex.in.share_access =
+   NTCREATEX_SHARE_ACCESS_READ
+   | NTCREATEX_SHARE_ACCESS_READ;
+   io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+   io.ntcreatex.in.create_options = 0;
+   io.ntcreatex.in.fname = "\\";
+   status = smb_raw_open(cli->tree, tctx, &io);
+   if (!NT_STATUS_IS_OK(status)) {
+   d_printf("smb_open on the directory failed: %s\n",
+nt_errstr(status));
+   ret = false;
+   goto done;
+   }
+   dnum = io.ntcreatex.out.file.fnum;
+
+   io.ntcreatex.in.flags =
+   NTCREATEX_FLAGS_REQUEST_OPLOCK
+   | NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
+   io.ntcreatex.in.root_fid = dnum;
+   io.ntcreatex.in.security_flags = 0;
+   io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OVERWRITE_IF;
+   io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+   io.ntcreatex.in.alloc_size = 0;
+   io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+   io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+   io.ntcreatex.in.create_options = 0;
+   io.ntcreatex.in.fname = fname;
+
+   status = smb_raw_open(cli->tree, tctx, &io);
+   if (!NT_STATUS_IS_OK(status)) {
+   d_printf("smb_open on the file %s failed: %s\n",
+fname, nt_errstr(status));
+   ret = false;
+   goto done;
+   }
+
+   smbcli_close(cli->tree, io.ntcreatex.out.file.fnum);
+   smbcli_close(cli->tree, dnum);
+   smbcli_unlink(cli->tree, fname);
+
+   ret = true;
+ done:
+   return ret;
+}
+

svn commit: samba r25311 - in branches: SAMBA_3_0_MAINT/source/smbd SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[vlendec]

Author: vlendec
Date: 2007-09-24 21:43:54 + (Mon, 24 Sep 2007)
New Revision: 25311

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25311

Log:
Patch from Heinrich Mislik <[EMAIL PROTECTED]> to fix AIX
quotas.

Heinrich, I trust you on that, I don't even have compiled this :-)

Volker

Modified:
   branches/SAMBA_3_0_MAINT/source/smbd/quotas.c
   branches/SAMBA_3_2/source/smbd/quotas.c
   branches/SAMBA_3_2_0/source/smbd/quotas.c


Changeset:
Modified: branches/SAMBA_3_0_MAINT/source/smbd/quotas.c
===
--- branches/SAMBA_3_0_MAINT/source/smbd/quotas.c   2007-09-24 19:48:10 UTC 
(rev 25310)
+++ branches/SAMBA_3_0_MAINT/source/smbd/quotas.c   2007-09-24 21:43:54 UTC 
(rev 25311)
@@ -1225,6 +1225,9 @@
   D.dqb_curblocks  = user_quota.bused;
   D.dqb_bsoftlimit = user_quota.bsoft;
   D.dqb_bhardlimit = user_quota.bhard;
+  D.dqb_curfiles   = user_quota.iused;
+  D.dqb_fsoftlimit = user_quota.isoft;
+  D.dqb_fhardlimit = user_quota.ihard;
 }
 else if(statbuf.f_vfstype == MNT_JFS)
 {

Modified: branches/SAMBA_3_2/source/smbd/quotas.c
===
--- branches/SAMBA_3_2/source/smbd/quotas.c 2007-09-24 19:48:10 UTC (rev 
25310)
+++ branches/SAMBA_3_2/source/smbd/quotas.c 2007-09-24 21:43:54 UTC (rev 
25311)
@@ -1236,6 +1236,9 @@
   D.dqb_curblocks  = user_quota.bused;
   D.dqb_bsoftlimit = user_quota.bsoft;
   D.dqb_bhardlimit = user_quota.bhard;
+  D.dqb_curfiles   = user_quota.iused;
+  D.dqb_fsoftlimit = user_quota.isoft;
+  D.dqb_fhardlimit = user_quota.ihard;
 }
 else if(statbuf.f_vfstype == MNT_JFS)
 {

Modified: branches/SAMBA_3_2_0/source/smbd/quotas.c
===
--- branches/SAMBA_3_2_0/source/smbd/quotas.c   2007-09-24 19:48:10 UTC (rev 
25310)
+++ branches/SAMBA_3_2_0/source/smbd/quotas.c   2007-09-24 21:43:54 UTC (rev 
25311)
@@ -1236,6 +1236,9 @@
   D.dqb_curblocks  = user_quota.bused;
   D.dqb_bsoftlimit = user_quota.bsoft;
   D.dqb_bhardlimit = user_quota.bhard;
+  D.dqb_curfiles   = user_quota.iused;
+  D.dqb_fsoftlimit = user_quota.isoft;
+  D.dqb_fhardlimit = user_quota.ihard;
 }
 else if(statbuf.f_vfstype == MNT_JFS)
 {

Build status as of Tue Sep 25 00:00:02 2007

[build]

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-09-24 
00:02:07.0 +
+++ /home/build/master/cache/broken_results.txt 2007-09-25 00:01:48.0 
+
@@ -1,4 +1,4 @@
-Build status as of Mon Sep 24 00:00:02 2007
+Build status as of Tue Sep 25 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -7,16 +7,16 @@
 ccache   32 10 0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  31 6  0 
+ldb  32 6  0 
 libreplace   31 9  0 
-lorikeet-heimdal 27 16 0 
+lorikeet-heimdal 26 16 0 
 pidl 18 4  0 
 ppp  11 8  0 
 python   0  0  0 
 rsync32 13 0 
 samba-docs   0  0  0 
 samba-gtk3  3  0 
-samba4   29 28 0 
+samba4   29 19 3 
 samba_3_232 16 0 
 smb-build30 30 0 
 talloc   32 1  0 

svn commit: samba r25312 - in branches/SAMBA_4_0/source/libnet: .

[mimir]

Author: mimir
Date: 2007-09-25 04:24:39 + (Tue, 25 Sep 2007)
New Revision: 25312

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25312

Log:
Replace the old-style composite calls.


rafal


Modified:
   branches/SAMBA_4_0/source/libnet/userman.c


Changeset:
Sorry, the patch is too large (900 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25312

svn commit: samba r25313 - in branches: SAMBA_3_2/source/rpc_client SAMBA_3_2_0/source/rpc_client

[gd]

Author: gd
Date: 2007-09-25 04:52:15 + (Tue, 25 Sep 2007)
New Revision: 25313

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25313

Log:
dd HKEY_CURRENT_USER to rpccli_winreg_Connect().

Guenther


Modified:
   branches/SAMBA_3_2/source/rpc_client/cli_reg.c
   branches/SAMBA_3_2_0/source/rpc_client/cli_reg.c


Changeset:
Modified: branches/SAMBA_3_2/source/rpc_client/cli_reg.c
===
--- branches/SAMBA_3_2/source/rpc_client/cli_reg.c  2007-09-25 04:24:39 UTC 
(rev 25312)
+++ branches/SAMBA_3_2/source/rpc_client/cli_reg.c  2007-09-25 04:52:15 UTC 
(rev 25313)
@@ -45,6 +45,10 @@
return rpccli_winreg_OpenHKU( cli, mem_ctx, NULL, 
access_mask, reg_hnd );
 
+   case HKEY_CURRENT_USER:
+   return rpccli_winreg_OpenHKCU( cli, mem_ctx, NULL, 
+   access_mask, reg_hnd );
+
case HKEY_PERFORMANCE_DATA:
return rpccli_winreg_OpenHKPD( cli, mem_ctx, NULL, 
access_mask, reg_hnd );

Modified: branches/SAMBA_3_2_0/source/rpc_client/cli_reg.c
===
--- branches/SAMBA_3_2_0/source/rpc_client/cli_reg.c2007-09-25 04:24:39 UTC 
(rev 25312)
+++ branches/SAMBA_3_2_0/source/rpc_client/cli_reg.c2007-09-25 04:52:15 UTC 
(rev 25313)
@@ -45,6 +45,10 @@
return rpccli_winreg_OpenHKU( cli, mem_ctx, NULL, 
access_mask, reg_hnd );
 
+   case HKEY_CURRENT_USER:
+   return rpccli_winreg_OpenHKCU( cli, mem_ctx, NULL, 
+   access_mask, reg_hnd );
+
case HKEY_PERFORMANCE_DATA:
return rpccli_winreg_OpenHKPD( cli, mem_ctx, NULL, 
access_mask, reg_hnd );

svn commit: samba r25314 - in branches: SAMBA_3_2/source/utils SAMBA_3_2_0/source/utils

[gd]

Author: gd
Date: 2007-09-25 04:54:20 + (Tue, 25 Sep 2007)
New Revision: 25314

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25314

Log:
Add HKEY_CURRENT_USER to reg_hive_key().

Guenther

Modified:
   branches/SAMBA_3_2/source/utils/net_rpc_registry.c
   branches/SAMBA_3_2_0/source/utils/net_rpc_registry.c


Changeset:
Modified: branches/SAMBA_3_2/source/utils/net_rpc_registry.c
===
--- branches/SAMBA_3_2/source/utils/net_rpc_registry.c  2007-09-25 04:52:15 UTC 
(rev 25313)
+++ branches/SAMBA_3_2/source/utils/net_rpc_registry.c  2007-09-25 04:54:20 UTC 
(rev 25314)
@@ -48,6 +48,9 @@
else if (strnequal(fullname, "HKU", len) ||
 strnequal(fullname, "HKEY_USERS", len))
(*reg_type) = HKEY_USERS;
+   else if (strnequal(fullname, "HKCU", len) ||
+strnequal(fullname, "HKEY_CURRENT_USER", len))
+   (*reg_type) = HKEY_CURRENT_USER;
else if (strnequal(fullname, "HKPD", len) ||
 strnequal(fullname, "HKEY_PERFORMANCE_DATA", len))
(*reg_type) = HKEY_PERFORMANCE_DATA;

Modified: branches/SAMBA_3_2_0/source/utils/net_rpc_registry.c
===
--- branches/SAMBA_3_2_0/source/utils/net_rpc_registry.c2007-09-25 
04:52:15 UTC (rev 25313)
+++ branches/SAMBA_3_2_0/source/utils/net_rpc_registry.c2007-09-25 
04:54:20 UTC (rev 25314)
@@ -48,6 +48,9 @@
else if (strnequal(fullname, "HKU", len) ||
 strnequal(fullname, "HKEY_USERS", len))
(*reg_type) = HKEY_USERS;
+   else if (strnequal(fullname, "HKCU", len) ||
+strnequal(fullname, "HKEY_CURRENT_USER", len))
+   (*reg_type) = HKEY_CURRENT_USER;
else if (strnequal(fullname, "HKPD", len) ||
 strnequal(fullname, "HKEY_PERFORMANCE_DATA", len))
(*reg_type) = HKEY_PERFORMANCE_DATA;

svn commit: samba r25315 - in branches/SAMBA_4_0/source/libnet: .

[mimir]

Author: mimir
Date: 2007-09-25 05:59:57 + (Tue, 25 Sep 2007)
New Revision: 25315

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25315

Log:
Revert my last change until I find out what's causing the
problem spotted by the builfarm.


rafal


Modified:
   branches/SAMBA_4_0/source/libnet/userman.c


Changeset:
Sorry, the patch is too large (900 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25315