Rev 607: fixed location of arp_filter in http://samba.org/~tridge/ctdb

2007-09-10 Thread tridge

revno: 607
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test
timestamp: Tue 2007-09-11 16:38:32 +1000
message:
  fixed location of arp_filter
modified:
  config/events.d/10.interface   10.interface-20070604050809-s21zslfirn07zjt8-1
=== modified file 'config/events.d/10.interface'
--- a/config/events.d/10.interface  2007-09-09 21:20:44 +
+++ b/config/events.d/10.interface  2007-09-11 06:38:32 +
@@ -26,7 +26,7 @@
  startup)
# make sure that we only respond to ARP messages from the NIC where
# a particular ip address is associated.
-   echo 1 > /proc/sys/ipv4/conf/all/arp_filter
+   echo 1 > /proc/sys/net/ipv4/conf/all/arp_filter
;;
 
 



Rev 617: remove these sleeps until volker has his new patch ready - they making using a system without winbind just about impossible in http://samba.org/~tridge/3_0-ctdb

2007-09-10 Thread tridge

revno: 617
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Tue 2007-09-11 15:25:56 +1000
message:
  remove these sleeps until volker has his new patch ready - they making using 
a system without winbind just about impossible
modified:
  source/nsswitch/wb_common.cwb_common.c-20070210173807-1wjifrbwaz6xnmgl-719
=== modified file 'source/nsswitch/wb_common.c'
--- a/source/nsswitch/wb_common.c   2007-09-03 10:28:57 +
+++ b/source/nsswitch/wb_common.c   2007-09-11 05:25:56 +
@@ -658,7 +658,6 @@
 * filehandle
 */
close_sock();
-   sleep(1);
winbindd_fd = winbind_open_pipe_sock(0, 0);
count++;
continue;
@@ -693,7 +692,6 @@
 * filehandle
 */
close_sock();
-   sleep(1);
winbindd_fd = winbind_open_pipe_sock(0, 1);
count++;
continue;



Rev 616: VNN is now PNN in http://samba.org/~tridge/3_0-ctdb

2007-09-10 Thread tridge

revno: 616
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Tue 2007-09-11 14:37:10 +1000
message:
  VNN is now PNN
modified:
  source/lib/messages.c  messages.c-20070210173807-1wjifrbwaz6xnmgl-491
=== modified file 'source/lib/messages.c'
--- a/source/lib/messages.c 2007-06-17 16:15:49 +
+++ b/source/lib/messages.c 2007-09-11 04:37:10 +
@@ -966,7 +966,7 @@
int32_t cstatus=-1;
NTSTATUS status;
status = ctdbd_control(ctdbd_ctx, 
-  CTDB_CURRENT_NODE, CTDB_CONTROL_GET_VNN, 0,
+  CTDB_CURRENT_NODE, CTDB_CONTROL_GET_PNN, 0,
   tdb_null, NULL, NULL, &cstatus);
*vnn = (uint32_t)cstatus;
return status;



svn commit: samba r25073 - in branches/SAMBA_4_0/source/torture/rpc: .

2007-09-10 Thread abartlet
Author: abartlet
Date: 2007-09-11 01:02:50 + (Tue, 11 Sep 2007)
New Revision: 25073

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

Log:
Correct test name so make test can pass again.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/rpc/rpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/rpc.c
===
--- branches/SAMBA_4_0/source/torture/rpc/rpc.c 2007-09-11 00:26:46 UTC (rev 
25072)
+++ branches/SAMBA_4_0/source/torture/rpc/rpc.c 2007-09-11 01:02:50 UTC (rev 
25073)
@@ -422,7 +422,7 @@
torture_suite_add_simple_test(suite, "SAMBA3-WKSSVC", 
torture_samba3_rpc_wkssvc);
torture_suite_add_simple_test(suite, "SAMBA3-WINREG", 
torture_samba3_rpc_winreg);
torture_suite_add_simple_test(suite, "DRSUAPI", torture_rpc_drsuapi);
-   torture_suite_add_simple_test(suite, "DRSUAPI-CRACKNAMES", 
torture_rpc_drsuapi_cracknames);
+   torture_suite_add_simple_test(suite, "CRACKNAMES", 
torture_rpc_drsuapi_cracknames);
torture_suite_add_suite(suite, torture_rpc_dssetup(suite));
torture_suite_add_simple_test(suite, "ALTERCONTEXT", 
torture_rpc_alter_context);
torture_suite_add_simple_test(suite, "JOIN", torture_rpc_join);



svn commit: samba r25072 - in branches/SAMBA_3_0_MAINT/source/nsswitch: .

2007-09-10 Thread gd
Author: gd
Date: 2007-09-11 00:26:46 + (Tue, 11 Sep 2007)
New Revision: 25072

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

Log:
Merge to 3_0_MAINT.

Guenther

Modified:
   branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c  2007-09-11 
00:19:10 UTC (rev 25071)
+++ branches/SAMBA_3_0_MAINT/source/nsswitch/winbindd_cm.c  2007-09-11 
00:26:46 UTC (rev 25072)
@@ -1558,6 +1558,16 @@
DEBUG(5, ("set_dc_type_and_flags: rpccli_ds_getprimarydominfo "
  "on domain %s failed: (%s)\n",
  domain->name, nt_errstr(result)));
+
+   /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+* every opcode on the LSARPC_DS pipe, continue with
+* no_lsarpc_ds mode here as well to get domain->initialized
+* set - gd */
+
+   if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+   goto no_lsarpc_ds;
+   }
+
return;
}




svn commit: samba r25071 - in branches/SAMBA_4_0/source/torture/rpc: .

2007-09-10 Thread abartlet
Author: abartlet
Date: 2007-09-11 00:19:10 + (Tue, 11 Sep 2007)
New Revision: 25071

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

Log:
Add some more testcases for RPC-DRSUAPI-CRACKNAMES, proving I can't
use this as a backend for the LSA LookupNames call.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/rpc/drsuapi_cracknames.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi_cracknames.c
===
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi_cracknames.c  2007-09-10 
23:47:29 UTC (rev 25070)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi_cracknames.c  2007-09-11 
00:19:10 UTC (rev 25071)
@@ -815,6 +815,27 @@
.status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
}, 
{
+   .format_offered = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+   .format_desired = 
DRSUAPI_DS_NAME_FORMAT_FQDN_1779,
+   .comment = "NT AUTHORITY\\ -> DN",
+   .str = "NT AUTHORITY\\",
+   .status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
+   }, 
+   {
+   .format_offered = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+   .format_desired = 
DRSUAPI_DS_NAME_FORMAT_FQDN_1779,
+   .comment = "NT AUTHORITY\\ANONYMOUS LOGON -> 
DN",
+   .str = "NT AUTHORITY\\ANONYMOUS LOGON",
+   .status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
+   }, 
+   {
+   .format_offered = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+   .format_desired = 
DRSUAPI_DS_NAME_FORMAT_FQDN_1779,
+   .comment = "NT AUTHORITY\\SYSTEM -> DN",
+   .str = "NT AUTHORITY\\SYSTEM",
+   .status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
+   }, 
+   {
.format_offered = 
DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
.format_desired = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
.comment = "BUITIN SID -> NT4 account",
@@ -849,6 +870,20 @@
},
{
.format_offered = 
DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
+   .format_desired = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+   .str = SID_NT_ANONYMOUS,
+   .comment = "NT Anonymous SID -> NT4 Account",
+   .status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
+   },
+   {
+   .format_offered = 
DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
+   .format_desired = 
DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT,
+   .str = SID_NT_SYSTEM,
+   .comment = "NT SYSTEM SID -> NT4 Account",
+   .status = DRSUAPI_DS_NAME_STATUS_NOT_FOUND
+   },
+   {
+   .format_offered = 
DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY,
.format_desired = 
DRSUAPI_DS_NAME_FORMAT_FQDN_1779,
.comment = "Domain SID -> DN",
.str = dom_sid,



Re: svn commit: samba r25069 - in branches/SAMBA_3_0_25/source/nsswitch: .

2007-09-10 Thread simo
On Mon, 2007-09-10 at 23:29 +, [EMAIL PROTECTED] wrote:
> Merge to 3_0_25 as well.

Günther 3_0 and 3_0_25 are closed now we are supposed to commit to
3_0_MAINT.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer
email: [EMAIL PROTECTED]
http://samba.org



Build status as of Tue Sep 11 00:00:03 2007

2007-09-10 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-09-10 
00:01:43.0 +
+++ /home/build/master/cache/broken_results.txt 2007-09-11 00:03:10.0 
+
@@ -1,4 +1,4 @@
-Build status as of Mon Sep 10 00:00:02 2007
+Build status as of Tue Sep 11 00:00:03 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -9,15 +9,15 @@
 distcc   2  0  0 
 ldb  27 4  0 
 libreplace   26 7  0 
-lorikeet-heimdal 23 11 0 
+lorikeet-heimdal 23 12 0 
 pidl 15 4  0 
 ppp  10 8  0 
 python   0  0  0 
-rsync28 13 0 
+rsync28 12 0 
 samba-docs   0  0  0 
 samba-gtk2  2  0 
-samba4   25 21 1 
-samba_3_228 16 0 
+samba4   26 15 1 
+samba_3_229 17 0 
 smb-build25 25 0 
 talloc   28 1  0 
 tdb  27 3  0 


svn commit: samba r25070 - in branches/SAMBA_4_0: . source source/torture/rpc

2007-09-10 Thread jelmer
Author: jelmer
Date: 2007-09-10 23:47:29 + (Mon, 10 Sep 2007)
New Revision: 25070

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

Log:
Revert DRSUAPI conversion to new API, as it broke some tests.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/samba4-knownfail
   branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
   branches/SAMBA_4_0/source/torture/rpc/drsuapi_cracknames.c
   branches/SAMBA_4_0/source/torture/rpc/rpc.c


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


Rev 606: get interface right in http://samba.org/~tridge/ctdb

2007-09-10 Thread tridge

revno: 606
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge.test
timestamp: Mon 2007-09-10 20:45:27 +1000
message:
  get interface right
modified:
  server/ctdb_takeover.c 
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'server/ctdb_takeover.c'
--- a/server/ctdb_takeover.c2007-09-10 04:27:29 +
+++ b/server/ctdb_takeover.c2007-09-10 10:45:27 +
@@ -457,7 +457,6 @@
for (i=0;idefault_public_interface;
} else {
-   iface = ifacebuf;
+   iface = tok;
}
 
if (add_public_address(ctdb, addr, mask, iface)) {



svn commit: samba r25069 - in branches/SAMBA_3_0_25/source/nsswitch: .

2007-09-10 Thread gd
Author: gd
Date: 2007-09-10 23:29:16 + (Mon, 10 Sep 2007)
New Revision: 25069

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

Log:
Merge to 3_0_25 as well.

Guenther

Modified:
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c 2007-09-10 23:12:27 UTC 
(rev 25068)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c 2007-09-10 23:29:16 UTC 
(rev 25069)
@@ -1558,6 +1558,16 @@
DEBUG(5, ("set_dc_type_and_flags: rpccli_ds_getprimarydominfo "
  "on domain %s failed: (%s)\n",
  domain->name, nt_errstr(result)));
+
+   /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+* every opcode on the LSARPC_DS pipe, continue with
+* no_lsarpc_ds mode here as well to get domain->initialized
+* set - gd */
+
+   if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+   goto no_lsarpc_ds;
+   }
+
return;
}




svn commit: samba r25068 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread gd
Author: gd
Date: 2007-09-10 23:12:27 + (Mon, 10 Sep 2007)
New Revision: 25068

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

Log:
Older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for every opcode on the
LSARPC_DS pipe, continue with no_lsarpc_ds mode here as well to get
domain->initialized set to True. This avoids permanent scanning of Samba3 DCs
in winbindd. Thanks Michael, for pointing this out.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_2/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_2_0/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2007-09-10 22:12:49 UTC 
(rev 25067)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2007-09-10 23:12:27 UTC 
(rev 25068)
@@ -1696,6 +1696,16 @@
DEBUG(5, ("set_dc_type_and_flags_connect: 
rpccli_ds_getprimarydominfo "
  "on domain %s failed: (%s)\n",
  domain->name, nt_errstr(result)));
+
+   /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+* every opcode on the LSARPC_DS pipe, continue with
+* no_lsarpc_ds mode here as well to get domain->initialized
+* set - gd */
+
+   if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+   goto no_lsarpc_ds;
+   }
+
return;
}


Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_cm.c2007-09-10 22:12:49 UTC 
(rev 25067)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_cm.c2007-09-10 23:12:27 UTC 
(rev 25068)
@@ -1715,6 +1715,16 @@
DEBUG(5, ("set_dc_type_and_flags_connect: 
rpccli_ds_getprimarydominfo "
  "on domain %s failed: (%s)\n",
  domain->name, nt_errstr(result)));
+
+   /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+* every opcode on the LSARPC_DS pipe, continue with
+* no_lsarpc_ds mode here as well to get domain->initialized
+* set - gd */
+
+   if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+   goto no_lsarpc_ds;
+   }
+
return;
}


Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_cm.c  2007-09-10 22:12:49 UTC 
(rev 25067)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_cm.c  2007-09-10 23:12:27 UTC 
(rev 25068)
@@ -1715,6 +1715,16 @@
DEBUG(5, ("set_dc_type_and_flags_connect: 
rpccli_ds_getprimarydominfo "
  "on domain %s failed: (%s)\n",
  domain->name, nt_errstr(result)));
+
+   /* older samba3 DCs will return DCERPC_FAULT_OP_RNG_ERROR for
+* every opcode on the LSARPC_DS pipe, continue with
+* no_lsarpc_ds mode here as well to get domain->initialized
+* set - gd */
+
+   if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+   goto no_lsarpc_ds;
+   }
+
return;
}




svn commit: samba r25067 - in branches/SAMBA_3_2_0/source: . include lib param printing rpc_server smbd

2007-09-10 Thread jra
Author: jra
Date: 2007-09-10 22:12:49 + (Mon, 10 Sep 2007)
New Revision: 25067

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

Log:
As agreed with Jerry. Move unix_convert to a talloc-based
interface. More development will come on top of this. Remove the
"mangled map" parameter.
Jeremy.


Removed:
   branches/SAMBA_3_2_0/source/smbd/mangle_map.c
Modified:
   branches/SAMBA_3_2_0/source/Makefile.in
   branches/SAMBA_3_2_0/source/include/mangle.h
   branches/SAMBA_3_2_0/source/lib/charcnv.c
   branches/SAMBA_3_2_0/source/param/loadparm.c
   branches/SAMBA_3_2_0/source/printing/nt_printing.c
   branches/SAMBA_3_2_0/source/rpc_server/srv_srvsvc_nt.c
   branches/SAMBA_3_2_0/source/smbd/dir.c
   branches/SAMBA_3_2_0/source/smbd/filename.c
   branches/SAMBA_3_2_0/source/smbd/mangle.c
   branches/SAMBA_3_2_0/source/smbd/mangle_hash.c
   branches/SAMBA_3_2_0/source/smbd/mangle_hash2.c
   branches/SAMBA_3_2_0/source/smbd/msdfs.c
   branches/SAMBA_3_2_0/source/smbd/nttrans.c
   branches/SAMBA_3_2_0/source/smbd/reply.c
   branches/SAMBA_3_2_0/source/smbd/statcache.c
   branches/SAMBA_3_2_0/source/smbd/trans2.c


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


svn commit: samba r25066 - in branches: .

2007-09-10 Thread jerry
Author: jerry
Date: 2007-09-10 21:58:21 + (Mon, 10 Sep 2007)
New Revision: 25066

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

Log:
Building release branch for Samba 3.2
Added:
   branches/SAMBA_3_2_RELEASE/


Changeset:
Copied: branches/SAMBA_3_2_RELEASE (from rev 25065, branches/SAMBA_3_2_0)



svn commit: samba r25065 - in branches: .

2007-09-10 Thread jerry
Author: jerry
Date: 2007-09-10 21:54:31 + (Mon, 10 Sep 2007)
New Revision: 25065

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

Log:
Copying SAMBA_3_0_25 to SAMBA_3_0_MAINT to start the maintenace process
Added:
   branches/SAMBA_3_0_MAINT/


Changeset:
Copied: branches/SAMBA_3_0_MAINT (from rev 25064, branches/SAMBA_3_0_25)



svn commit: samba r25064 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 19:19:59 + (Mon, 10 Sep 2007)
New Revision: 25064

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

Log:

We use BOOL/True/False not bool/true/false


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 19:14:22 UTC 
(rev 25063)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 19:19:59 UTC 
(rev 25064)
@@ -78,7 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
-   bool anon = false;
+   BOOL anon = False;
 
/* assume anonymous if we don't have a specified user */
 
@@ -87,10 +87,10 @@
if ( tmp ) {
if (!dom) {
/* only the alloc backend can pass in a NULL dom */
-   secret = idmap_fetch_secret("ldap", true,
+   secret = idmap_fetch_secret("ldap", True,
NULL, tmp);
} else {
-   secret = idmap_fetch_secret("ldap", false,
+   secret = idmap_fetch_secret("ldap", False,
dom->name, tmp);
}
 
@@ -107,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   anon = true;
+   anon = True;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );

Modified: branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 19:14:22 UTC 
(rev 25063)
+++ branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 19:19:59 UTC 
(rev 25064)
@@ -78,7 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
-   bool anon = false;
+   BOOL anon = False;
 
/* assume anonymous if we don't have a specified user */
 
@@ -87,10 +87,10 @@
if ( tmp ) {
if (!dom) {
/* only the alloc backend can pass in a NULL dom */
-   secret = idmap_fetch_secret("ldap", true,
+   secret = idmap_fetch_secret("ldap", True,
NULL, tmp);
} else {
-   secret = idmap_fetch_secret("ldap", false,
+   secret = idmap_fetch_secret("ldap", False,
dom->name, tmp);
}
 
@@ -107,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   anon = true;
+   anon = True;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );

Modified: branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 19:14:22 UTC 
(rev 25063)
+++ branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 19:19:59 UTC 
(rev 25064)
@@ -78,7 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
-   bool anon = false;
+   BOOL anon = False;
 
/* assume anonymous if we don't have a specified user */
 
@@ -87,10 +87,10 @@
if ( tmp ) {
if (!dom) {
/* only the alloc backend can pass in a NULL dom */
-   secret = idmap_fetch_secret("ldap", true,
+   secret = idmap_fetch_secret("ldap", True,
NULL, tmp);
} else {
-   secret = idmap_fetch_secret("ldap", false,
+   secret = idmap_fetch_secret("ldap", False,
dom->name, tmp);
}
 
@@ -107,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   anon = true;
+   anon = True;

svn commit: samba r25063 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 19:14:22 + (Mon, 10 Sep 2007)
New Revision: 25063

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

Log:

Fix segfault in smbldp_set_creds when we want to use anonymous, the
code was not passing in the "anon" flag correctly and was passing
NULL pointers.



Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 19:04:57 UTC 
(rev 25062)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 19:14:22 UTC 
(rev 25063)
@@ -78,6 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
+   bool anon = false;
 
/* assume anonymous if we don't have a specified user */
 
@@ -106,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   *dn = talloc_strdup(mem_ctx, "");
+   anon = true;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );
@@ -114,10 +115,10 @@
}
}
 
-   smbldap_set_creds(ldap_state, false, *dn, secret);
+   smbldap_set_creds(ldap_state, anon, *dn, secret);
ret = NT_STATUS_OK;
 
- done:
+done:
SAFE_FREE(secret);
 
return ret;

Modified: branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 19:04:57 UTC 
(rev 25062)
+++ branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 19:14:22 UTC 
(rev 25063)
@@ -78,6 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
+   bool anon = false;
 
/* assume anonymous if we don't have a specified user */
 
@@ -106,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   *dn = talloc_strdup(mem_ctx, "");
+   anon = true;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );
@@ -114,10 +115,10 @@
}
}
 
-   smbldap_set_creds(ldap_state, false, *dn, secret);
+   smbldap_set_creds(ldap_state, anon, *dn, secret);
ret = NT_STATUS_OK;
 
- done:
+done:
SAFE_FREE(secret);
 
return ret;

Modified: branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 19:04:57 UTC 
(rev 25062)
+++ branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 19:14:22 UTC 
(rev 25063)
@@ -78,6 +78,7 @@
char *secret = NULL;
const char *tmp = NULL;
char *user_dn = NULL;
+   bool anon = false;
 
/* assume anonymous if we don't have a specified user */
 
@@ -106,7 +107,7 @@
if (!fetch_ldap_pw(&user_dn, &secret)) {
DEBUG(2, ("get_credentials: Failed to lookup ldap "
  "bind creds. Using anonymous connection.\n"));
-   *dn = talloc_strdup(mem_ctx, "");
+   anon = true;
} else {
*dn = talloc_strdup(mem_ctx, user_dn);
SAFE_FREE( user_dn );
@@ -114,10 +115,10 @@
}
}
 
-   smbldap_set_creds(ldap_state, false, *dn, secret);
+   smbldap_set_creds(ldap_state, anon, *dn, secret);
ret = NT_STATUS_OK;
 
- done:
+done:
SAFE_FREE(secret);
 
return ret;



svn commit: samba r25062 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 19:04:57 + (Mon, 10 Sep 2007)
New Revision: 25062

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

Log:

Reformat, remove trailing spaces and fit lines into 80 columns


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c


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


svn commit: samba r25061 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib

2007-09-10 Thread vlendec
Author: vlendec
Date: 2007-09-10 17:49:51 + (Mon, 10 Sep 2007)
New Revision: 25061

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

Log:
Pro-actively shut up Coverity :-)

Modified:
   branches/SAMBA_3_2/source/lib/file_id.c
   branches/SAMBA_3_2_0/source/lib/file_id.c


Changeset:
Modified: branches/SAMBA_3_2/source/lib/file_id.c
===
--- branches/SAMBA_3_2/source/lib/file_id.c 2007-09-10 16:56:51 UTC (rev 
25060)
+++ branches/SAMBA_3_2/source/lib/file_id.c 2007-09-10 17:49:51 UTC (rev 
25061)
@@ -57,9 +57,11 @@
  */
 const char *file_id_string_tos(const struct file_id *id)
 {
-   return talloc_asprintf(talloc_tos(), "%llx:%llx", 
-  (unsigned long long)id->devid, 
-  (unsigned long long)id->inode);
+   char *result = talloc_asprintf(talloc_tos(), "%llx:%llx", 
+  (unsigned long long)id->devid, 
+  (unsigned long long)id->inode);
+   SMB_ASSERT(result != NULL);
+   return result;
 }
 
 /*

Modified: branches/SAMBA_3_2_0/source/lib/file_id.c
===
--- branches/SAMBA_3_2_0/source/lib/file_id.c   2007-09-10 16:56:51 UTC (rev 
25060)
+++ branches/SAMBA_3_2_0/source/lib/file_id.c   2007-09-10 17:49:51 UTC (rev 
25061)
@@ -57,9 +57,11 @@
  */
 const char *file_id_string_tos(const struct file_id *id)
 {
-   return talloc_asprintf(talloc_tos(), "%llx:%llx", 
-  (unsigned long long)id->devid, 
-  (unsigned long long)id->inode);
+   char *result = talloc_asprintf(talloc_tos(), "%llx:%llx", 
+  (unsigned long long)id->devid, 
+  (unsigned long long)id->inode);
+   SMB_ASSERT(result != NULL);
+   return result;
 }
 
 /*



Re: svn commit: samba r25055 - in branches: SAMBA_3_2/source/lib SAMBA_3_2/source/locking SAMBA_3_2/source/modules SAMBA_3_2/source/smbd SAMBA_3_2/source/torture SAMBA_3_2/source/utils SAMBA_3_2_0/sou

2007-09-10 Thread Jeremy Allison
On Mon, Sep 10, 2007 at 10:56:10AM +, [EMAIL PROTECTED] wrote:
> Author: vlendec
> Date: 2007-09-10 10:56:07 + (Mon, 10 Sep 2007)
> New Revision: 25055
> 
> WebSVN: 
> http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25055
> 
> Log:
> Add file_id_string_tos
> 
> This removes file_id_string_static and file_id_string_static2

Isn't coverity going to bitch and moan about the potential
for null indirection ? :-).

I think adding an smb_panic call if the talloc_asprintf
fails migh help here.

Jeremy.


svn commit: samba r25060 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 16:56:51 + (Mon, 10 Sep 2007)
New Revision: 25060

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

Log:

Fix formatting, remove trailing spaces and cut lines longer than 80 chars


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap.c
   branches/SAMBA_3_2/source/nsswitch/idmap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap.c


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


svn commit: samba r25059 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 16:21:55 + (Mon, 10 Sep 2007)
New Revision: 25059

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

Log:

Apply to 3.2 as well


Modified:
   branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 16:20:41 UTC 
(rev 25058)
+++ branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-09-10 16:21:55 UTC 
(rev 25059)
@@ -287,16 +287,9 @@
}
CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
-   tmp = lp_ldap_idmap_suffix();
+   tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", 
NULL);
if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, "idmap alloc config", 
"ldap_base_dn", NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   }
+   tmp = lp_ldap_idmap_suffix();
if ( ! tmp) {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
@@ -781,21 +774,16 @@
}
CHECK_ALLOC_DONE(ctx->url);
 
-   tmp = lp_ldap_idmap_suffix();
-   if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", 
NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   } else {
-   DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-   ret = NT_STATUS_UNSUCCESSFUL;
-   goto done;
-   }   
-   }
+tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+if ( ! tmp || ! *tmp) {
+tmp = lp_ldap_idmap_suffix();
+if ( ! tmp) {
+DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+ret = NT_STATUS_UNSUCCESSFUL;
+goto done;
+   }
+}
+
ctx->suffix = talloc_strdup(ctx, tmp);
CHECK_ALLOC_DONE(ctx->suffix);
 

Modified: branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 16:20:41 UTC 
(rev 25058)
+++ branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c   2007-09-10 16:21:55 UTC 
(rev 25059)
@@ -287,16 +287,9 @@
}
CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
-   tmp = lp_ldap_idmap_suffix();
+   tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", 
NULL);
if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, "idmap alloc config", 
"ldap_base_dn", NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   }
+   tmp = lp_ldap_idmap_suffix();
if ( ! tmp) {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
@@ -781,21 +774,16 @@
}
CHECK_ALLOC_DONE(ctx->url);
 
-   tmp = lp_ldap_idmap_suffix();
-   if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", 
NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   } else {
-   DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-   ret = NT_STATUS_UNSUCCESSFUL;
-   goto done;
-   }   
-   }
+tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+if ( ! tmp || ! *tmp) {
+tmp = lp_ldap_idmap_suffix();
+if ( ! tmp) {
+DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+ret = NT_STATUS_UNSUCCESSFUL;
+goto done;
+   }
+}
+
ctx->suffix = talloc_strd

svn commit: samba r25058 - in branches/SAMBA_3_0_25/source/nsswitch: .

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 16:20:41 + (Mon, 10 Sep 2007)
New Revision: 25058

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

Log:

Fix #4772 the idmap ldap suffix was evaluated in the wrong order resulting
in the code giving precedence to the old global prameter instead of the one
specified for the specific idmap domain configuration.


Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 15:14:39 UTC 
(rev 25057)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c  2007-09-10 16:20:41 UTC 
(rev 25058)
@@ -287,16 +287,9 @@
}
CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
-   tmp = lp_ldap_idmap_suffix();
+   tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", 
NULL);
if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, "idmap alloc config", 
"ldap_base_dn", NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   }
+   tmp = lp_ldap_idmap_suffix();
if ( ! tmp) {
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
ret = NT_STATUS_UNSUCCESSFUL;
@@ -780,21 +773,16 @@
}
CHECK_ALLOC_DONE(ctx->url);
 
-   tmp = lp_ldap_idmap_suffix();
-   if ( ! tmp || ! *tmp) {
-   tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", 
NULL);
-   }
-   if ( ! tmp) {
-   tmp = lp_ldap_suffix();
-   if (tmp) {
-   DEBUG(1, ("WARNING: Trying to use the global ldap 
suffix(%s)\n", tmp));
-   DEBUGADD(1, ("as suffix. This may not be what you 
want!\n"));
-   } else {
-   DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-   ret = NT_STATUS_UNSUCCESSFUL;
-   goto done;
-   }   
-   }
+tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+if ( ! tmp || ! *tmp) {
+tmp = lp_ldap_idmap_suffix();
+if ( ! tmp) {
+DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+ret = NT_STATUS_UNSUCCESSFUL;
+goto done;
+   }
+}
+
ctx->suffix = talloc_strdup(ctx, tmp);
CHECK_ALLOC_DONE(ctx->suffix);
 



svn commit: samba r25057 - in branches: SAMBA_3_2/examples/LDAP SAMBA_3_2_0/examples/LDAP

2007-09-10 Thread idra
Author: idra
Date: 2007-09-10 15:14:39 + (Mon, 10 Sep 2007)
New Revision: 25057

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

Log:

Add a schema file ready to be used in Fedora/RedHat Directory Server


Added:
   branches/SAMBA_3_2/examples/LDAP/samba-schema-FDS.ldif
   branches/SAMBA_3_2_0/examples/LDAP/samba-schema-FDS.ldif


Changeset:
Added: branches/SAMBA_3_2/examples/LDAP/samba-schema-FDS.ldif
===
--- branches/SAMBA_3_2/examples/LDAP/samba-schema-FDS.ldif  2007-09-10 
15:06:05 UTC (rev 25056)
+++ branches/SAMBA_3_2/examples/LDAP/samba-schema-FDS.ldif  2007-09-10 
15:14:39 UTC (rev 25057)
@@ -0,0 +1,156 @@
+## schema file for Fedora/RedHat Directory Server
+##
+## NOTE: this file can be copied as 60samba.ldif into your instance schema
+## directory:
+## cp samba-schema-FDS.ldif 
/etc/dirsrv/slapd-/schema/60schema.ldif
+##
+## Schema for storing Samba user accounts and group maps in LDAP
+## OIDs are owned by the Samba Team
+##
+## Prerequisite schemas - uid (cosine.schema)
+##  - displayName (inetorgperson.schema)
+##  - gidNumber   (nis.schema)
+##
+## 1.3.6.1.4.1.7165.2.1.x - attributeTypess
+## 1.3.6.1.4.1.7165.2.2.x - objectClasseses
+##
+## Printer support
+## 1.3.6.1.4.1.7165.2.3.1.x - attributeTypess
+## 1.3.6.1.4.1.7165.2.3.2.x - objectClasseses
+##
+## Samba4
+## 1.3.6.1.4.1.7165.4.1.x - attributeTypess
+## 1.3.6.1.4.1.7165.4.2.x - objectClasseses
+## 1.3.6.1.4.1.7165.4.3.x - LDB/LDAP Controls
+## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations
+## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and 
standards-track
+##
+dn: cn=schema
+##
+###
+##Attributes used by Samba 3.0 schema##
+###
+##
+## Password hashes##
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC 
'LanManager Password' EQUALITY caseIgnoreIA5Match SYNTAX 
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' DESC 'MD4 
hash of the unicode password' EQUALITY caseIgnoreIA5Match SYNTAX 
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
+##
+## Account flags in string format ([UWDX ])
+##
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags' DESC 'Account 
Flags' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} 
SINGLE-VALUE )
+##
+## Password timestamps & policies
+##
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.27 NAME 'sambaPwdLastSet' DESC 
'Timestamp of the last password update' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.28 NAME 'sambaPwdCanChange' DESC 
'Timestamp of when the user is allowed to update the password' EQUALITY 
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.29 NAME 'sambaPwdMustChange' DESC 
'Timestamp of when the password will expire' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.30 NAME 'sambaLogonTime' DESC 
'Timestamp of last logon' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.31 NAME 'sambaLogoffTime' DESC 
'Timestamp of last logoff' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.32 NAME 'sambaKickoffTime' DESC 
'Timestamp of when the user will be logged off automatically' EQUALITY 
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' DESC 
'Bad password attempt count' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.49 NAME 'sambaBadPasswordTime' DESC 
'Time of the last bad password attempt' EQUALITY integerMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.55 NAME 'sambaLogonHours' DESC 'Logon 
Hours' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{42} 
SINGLE-VALUE )
+##
+## string settings
+##
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.33 NAME 'sambaHomeDrive' DESC 'Driver 
letter of home directory mapping' EQUALITY caseIgnoreIA5Match SYNTAX 
1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.34 NAME 'sambaLogonScript' DESC 'Logon 
script path' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} 
SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.35 NAME 'sambaProfilePath' DESC 
'Roaming profile path' EQUALITY caseIgnoreMatch SYNTAX 
1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.36 NAME 'sambaUserWorkstation

svn commit: samba r25056 - in branches/SAMBA_4_0: . source/script

2007-09-10 Thread jelmer
Author: jelmer
Date: 2007-09-10 15:06:05 + (Mon, 10 Sep 2007)
New Revision: 25056

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

Log:
Install some extra files. Patch from Stefan Gohmann
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/installmisc.sh


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/script/installmisc.sh
===
--- branches/SAMBA_4_0/source/script/installmisc.sh 2007-09-10 10:56:07 UTC 
(rev 25055)
+++ branches/SAMBA_4_0/source/script/installmisc.sh 2007-09-10 15:06:05 UTC 
(rev 25056)
@@ -16,6 +16,10 @@
 mkdir -p $SETUPDIR || exit 1
 cp setup/schema-map-* $SETUPDIR || exit 1
 cp setup/DB_CONFIG $SETUPDIR || exit 1
+cp setup/upgrade $SETUPDIR || exit 1
+cp setup/provision-backend $SETUPDIR || exit 1
+cp setup/provision $SETUPDIR || exit 1
+cp setup/newuser $SETUPDIR || exit 1
 cp setup/*.inf $SETUPDIR || exit 1
 cp setup/*.ldif $SETUPDIR || exit 1
 cp setup/*.reg $SETUPDIR || exit 1