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

2005-07-29 Thread mimir
Author: mimir
Date: 2005-07-29 06:42:43 + (Fri, 29 Jul 2005)
New Revision: 8845

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8845

Log:
Removing unnecessary string length calculations. Thanks abartlet
for noticing that.


rafal


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


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/userman.c
===
--- branches/SAMBA_4_0/source/libnet/userman.c  2005-07-29 02:35:48 UTC (rev 
8844)
+++ branches/SAMBA_4_0/source/libnet/userman.c  2005-07-29 06:42:43 UTC (rev 
8845)
@@ -518,40 +518,30 @@
if (s-change.fields) {
if (s-change.fields  USERMOD_FIELD_ACCOUNT_NAME) {
level = 7;
-   i-info7.account_name.length = 
2*strlen_m(s-change.account_name);
-   i-info7.account_name.size   = 
2*strlen_m(s-change.account_name);
i-info7.account_name.string = s-change.account_name;
 
s-change.fields ^= USERMOD_FIELD_ACCOUNT_NAME;
 
} else if (s-change.fields  USERMOD_FIELD_FULL_NAME) {
level = 8;
-   i-info8.full_name.length = 
2*strlen_m(s-change.full_name);
-   i-info8.full_name.size   = 
2*strlen_m(s-change.full_name);
i-info8.full_name.string = s-change.full_name;

s-change.fields ^= USERMOD_FIELD_FULL_NAME;
 
} else if (s-change.fields  USERMOD_FIELD_DESCRIPTION) {
level = 13;
-   i-info13.description.length = 
2*strlen_m(s-change.description);
-   i-info13.description.size   = 
2*strlen_m(s-change.description);
i-info13.description.string = s-change.description;

s-change.fields ^= USERMOD_FIELD_DESCRIPTION;
 
} else if (s-change.fields  USERMOD_FIELD_LOGON_SCRIPT) {
level = 11;
-   i-info11.logon_script.length = 
2*strlen_m(s-change.logon_script);
-   i-info11.logon_script.size   = 
2*strlen_m(s-change.logon_script);
i-info11.logon_script.string = s-change.logon_script;

s-change.fields ^= USERMOD_FIELD_LOGON_SCRIPT;
 
} else if (s-change.fields  USERMOD_FIELD_PROFILE_PATH) {
level = 12;
-   i-info12.profile_path.length = 
2*strlen_m(s-change.profile_path);
-   i-info12.profile_path.size   = 
2*strlen_m(s-change.profile_path);
i-info12.profile_path.string = s-change.profile_path;
 
s-change.fields ^= USERMOD_FIELD_PROFILE_PATH;
@@ -564,8 +554,8 @@
}
}
 
-   s-setuser.in.level= level;
-   s-setuser.in.info = i;
+   s-setuser.in.level  = level;
+   s-setuser.in.info   = i;
 
s-req = dcerpc_samr_SetUserInfo_send(s-pipe, c, s-setuser);
 



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

2005-07-29 Thread abartlet
Author: abartlet
Date: 2005-07-29 08:48:39 + (Fri, 29 Jul 2005)
New Revision: 8846

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8846

Log:
Test yet more NTLMv2 combinations.

I can't get a few of the session key values right (and these tests are
#if 0'ed out), but this expands the testing.

Andrew Bartlett

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


Changeset:
Sorry, the patch is too large (275 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8846


svn commit: lorikeet r385 - in trunk/sangria/src: .

2005-07-29 Thread amit
Author: amit
Date: 2005-07-29 09:38:56 + (Fri, 29 Jul 2005)
New Revision: 385

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=385

Log:
different classes put into different files and the new class handling the user 
accounts added 
Added:
   trunk/sangria/src/Accounts.py
   trunk/sangria/src/Comment.py
   trunk/sangria/src/FileAndPrintService.py
   trunk/sangria/src/test.py
Removed:
   trunk/sangria/src/new_make_smb_conf.py


Changeset:
Sorry, the patch is too large (678 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=385


svn commit: samba r8847 - in branches/SAMBA_4_0/source: include libnet utils/net

2005-07-29 Thread abartlet
Author: abartlet
Date: 2005-07-29 10:58:05 + (Fri, 29 Jul 2005)
New Revision: 8847

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8847

Log:
Rework the Samba4 'net join' code.  I'm trying to get this closer to
what WinXP does when joining an AD domain, but in the meantime this
removes the excess unions, and uses the LSA pipe in same way XP does.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/libnet/config.mk
   branches/SAMBA_4_0/source/libnet/libnet_join.c
   branches/SAMBA_4_0/source/libnet/libnet_join.h
   branches/SAMBA_4_0/source/utils/net/net_join.c


Changeset:
Sorry, the patch is too large (872 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8847


svn commit: samba-web r763 - in trunk: history news/releases

2005-07-29 Thread deryck
Author: deryck
Date: 2005-07-29 14:22:39 + (Fri, 29 Jul 2005)
New Revision: 763

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=763

Log:
Add news announcement for 3.0.20rc1.
Move older announcemnet to history page.


Added:
   trunk/news/releases/3.0.20rc1.html
Modified:
   trunk/history/index.html


Changeset:
Modified: trunk/history/index.html
===
--- trunk/history/index.html2005-07-28 23:22:07 UTC (rev 762)
+++ trunk/history/index.html2005-07-29 14:22:39 UTC (rev 763)
@@ -6,7 +6,7 @@
 
 div class=latest 
   ul
-  liLatest Release mdash; a href=/samba/index.html#latestSamba 
3.0.20pre2/a/li
+  liLatest Release mdash; a href=/samba/index.html#latestSamba 
3.0.20rc1/a/li
   liCurrent Stable Release mdash; a href=#stableSamba 3.0.14a/a/li 
   !-- Second link will point to #stable on this page when current release is 
a development release --
   /ul
@@ -16,6 +16,49 @@
 
 
 h2Previous Release Announcments/h2
+h4a22 July 2005/a/h4
+p class=headlineSamba 3.0.20pre2 Available for Download/p
+
+pSamba 3.0.20pre2 is the second preview release of the Samba 3.0.20 
+code base (fourth if you count 3.0.15pre1 - 2) and
+is provided for testing only.  This release is emnot/em intended
+for production servers.  There has been a substantial amount
+of development since the 3.0.14a production release.  We would like 
+to ask the Samba
+community for help in testing these changes as we work towards
+the next official, production Samba 3.0 release.  It is strongly
+recommended that you read the 
+a href=/samba/ftp/pre/WHATSNEW-3-0-20pre2.txtchanges in this
+preview release/a to learn about smb.conf changes, new features,
+etc...  This is the last anticipated preview release before 
+moving on to the Release Candidate state./p
+
+pemSo what happened to 3.0.15 trough 3.0.19?/em  After some 
+discussion it was deemed that the amount of changes
+going into the next Samba 3.0 release needed something to catch
+people's attention.  Skipping several releases was chosen as
+the best solution with the least overhead.  There will be no
+3.0.15 - 3.0.19 ever released.  The next production release
+following 3.0.20 should be 3.0.21.  You can also read the 
+a href=http://marc.theaimsgroup.com/?l=sambam=111721010206997w=2;original
+announcement on the samba mailing list/a./p
+
+pThe a href=/samba/ftp/pre/samba-3.0.20pre2.tar.gzSamba 3.0.20pre2
+source code/a can be downloaded now.  The a
+href=/samba/ftp/pre/samba-3.0.20pre2.tar.ascGnuPG
+signature for the emun/emcompressed tarball/a is also available.
+Precompiled packages for Fedora Core 3 are available in the
+a href=/samba/ftp/Binary_Packages/Binary_Packages
+download area/a.  Packages for other platforms will be available
+shortly./p
+
+pSamba 3.0.20pre2 is also available via BitTorrent
+(a 
href=http://torrent.samba.org/samba/ftp/pre/samba-3.0.20pre2.tar.gz.torrent;samba-3.0.20pre2.tar.gz.torrent/a).
+Note that when downloading via BitTorrent, you are encouraged
+to verify the resulting uncompressed tarball's
+a href=/samba/ftp/pre/samba-3.0.20pre2.tar.ascGPG signature/a./p
+
+
 h4a21 June 2005/a/h4
 p class=headlineSamba 3.0.20pre1 Available for Download/p
 
@@ -239,23 +282,5 @@
 a href=/samba/ftp/Binary_Packages/Binary_Packages download area/a./p
  
 
-h4a21 January 2005/a/h4
-p class=headlineSamba 3.0.11pre2 Available for Download/p
 
-pThis is a preview release of the Samba 3.0.11 code base and
-is provided for testing only.  This release is *not* intended
-for production servers.  However, there have been several bug
-fixes since 3.0.10 that we feel are important to make available
-to the Samba community for wider testing.  Please refer to the 
-a href=/samba/ftp/pre/WHATSNEW-3-0-11pre2.txtRelease Notes/a for
-details on specific changes./p
-
-pThe a href=/samba/ftp/pre/samba-3.0.11pre2.tar.gzSamba 3.0.11pre2
-source code/a can be downloaded now.  The a 
href=/samba/ftp/pre/samba-3.0.11pre2.tar.ascGnuPG
-signature for the uncompressed tarball/a is also available.
-Precompiled packages for various platforms are available in the
-a href=/samba/ftp/Binary_Packages/Binary_Packages
-download area/a./p
-
-
 !--#include virtual=footer_history.html --

Added: trunk/news/releases/3.0.20rc1.html
===
--- trunk/news/releases/3.0.20rc1.html  2005-07-28 23:22:07 UTC (rev 762)
+++ trunk/news/releases/3.0.20rc1.html  2005-07-29 14:22:39 UTC (rev 763)
@@ -0,0 +1,41 @@
+h3a name=3.0.20rc1Samba 3.0.20rc1 Available for Download/a/h3 
+
+div class=article
+pSamba 3.0.20rc1 is the first release candidate of the 3.0.20 code 
+   base and is provided for testing purposes only.  While close to 
+   the final stable release, this snapshot is emnot/em intended for 
+   production servers.  If all goes well, this could become the final 
+   3.0.20 release.  We would like to ask the Samba
+   

svn commit: samba r8848 - in trunk/source/rpc_server: .

2005-07-29 Thread jra
Author: jra
Date: 2005-07-29 16:24:39 + (Fri, 29 Jul 2005)
New Revision: 8848

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8848

Log:
Fix first eventlog initialization crash. There are others...
Jeremy.

Modified:
   trunk/source/rpc_server/srv_eventlog_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_eventlog_nt.c
===
--- trunk/source/rpc_server/srv_eventlog_nt.c   2005-07-29 10:58:05 UTC (rev 
8847)
+++ trunk/source/rpc_server/srv_eventlog_nt.c   2005-07-29 16:24:39 UTC (rev 
8848)
@@ -209,8 +209,7 @@
 
/* for each eventlog that we have, find info related to it and copy to 
the new DB */
evtlog_list = lp_eventlog_list();
-   while (*evtlog_list) 
-   {
+   while (evtlog_list  *evtlog_list) {
DEBUG(10,(cleanup_eventlog_parameters: Cleaning up 
=[%s]\n,*evtlog_list));   

safe_strcpy(evtlogname,(*evtlog_list),sizeof(evtlogname)-1);



svn commit: samba r8849 - in trunk/source/rpc_server: .

2005-07-29 Thread jra
Author: jra
Date: 2005-07-29 16:45:03 + (Fri, 29 Jul 2005)
New Revision: 8849

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8849

Log:
Fix more eventlog crash bugs. Make this code look like the rest of Samba.
Jeremy.

Modified:
   trunk/source/rpc_server/srv_eventlog_nt.c


Changeset:
Sorry, the patch is too large (1152 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8849


svn commit: samba r8850 - in branches/SOC/SAMBA_4_0: source source/build/m4 source/build/pidl source/build/pidl/Parse source/build/pidl/Parse/Pidl source/build/pidl/Parse/Pidl/Ethereal source/build/pi

2005-07-29 Thread brad
Author: brad
Date: 2005-07-29 19:07:57 + (Fri, 29 Jul 2005)
New Revision: 8850

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8850

Log:
Bringing my tree up to date
Added:
   branches/SOC/SAMBA_4_0/source/Makefile
   branches/SOC/SAMBA_4_0/source/Makefile.in
   branches/SOC/SAMBA_4_0/source/build/pidl/Makefile.PL
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Compat.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Dump.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR/Header.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Ethereal/NDR/Parser.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/IDL.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/NDR.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/ODL.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/COM/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/COM/Header.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/COM/Proxy.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/COM/Stub.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJS.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/EJSHeader.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Header.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Client.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/NDR/Server.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/SWIG.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Samba/Template.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Test.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Typelist.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/Parse/Pidl/Util.pm
   branches/SOC/SAMBA_4_0/source/build/pidl/pidl
   branches/SOC/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SOC/SAMBA_4_0/source/build/tests/os2_delete.c
   branches/SOC/SAMBA_4_0/source/config.cache
   branches/SOC/SAMBA_4_0/source/config.log
   branches/SOC/SAMBA_4_0/source/config.mk
   branches/SOC/SAMBA_4_0/source/config.pm
   branches/SOC/SAMBA_4_0/source/config.status
   branches/SOC/SAMBA_4_0/source/configure
   branches/SOC/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
   branches/SOC/SAMBA_4_0/source/extra_cflags.txt
   branches/SOC/SAMBA_4_0/source/heimdal/
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/524.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/default_config.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/headers.h
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kaserver.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kdc-protos.h
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kdc.h
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kdc_locl.h
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kerberos4.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/kerberos5.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/log.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/misc.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/pkinit.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/process.c
   branches/SOC/SAMBA_4_0/source/heimdal/kdc/rx.h
   branches/SOC/SAMBA_4_0/source/heimdal/lib/
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/asn1-common.h
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/asn1_err.et
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/asn1_err.h
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/asn1_files
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der.h
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_cmp.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_copy.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_free.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_get.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_length.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_locl.h
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/der_put.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen_copy.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen_decode.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen_encode.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen_free.c
   branches/SOC/SAMBA_4_0/source/heimdal/lib/asn1/gen_glue.c
   

svn commit: samba r8851 - in branches/SOC/SAMBA_4_0/source: include torture/rpc

2005-07-29 Thread brad
Author: brad
Date: 2005-07-29 22:48:04 + (Fri, 29 Jul 2005)
New Revision: 8851

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8851

Log:
making dssync.c more ldb-centric, reverted samlogon.c from rev. 8845 to get my 
branch to compile again.
Added:
   branches/SOC/SAMBA_4_0/source/torture/rpc/samlogon.c
Removed:
   branches/SOC/SAMBA_4_0/source/torture/rpc/samlogon.c
Modified:
   branches/SOC/SAMBA_4_0/source/include/version.h
   branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:
Sorry, the patch is too large (3280 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8851


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

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-29 23:31:44 + (Fri, 29 Jul 2005)
New Revision: 8852

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8852

Log:
fixed the build

andrew, please check

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c2005-07-29 22:48:04 UTC 
(rev 8851)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c2005-07-29 23:31:44 UTC 
(rev 8852)
@@ -1146,7 +1146,9 @@
{test_lmv2_no_dom, LMv2 (no domain), False},
{test_ntlmv2_lmv2_broken, NTLMv2 and LMv2, LMv2 broken, False},
{test_ntlmv2_lmv2_broken_no_dom, NTLMv2 and LMv2, LMv2 broken (no 
domain), False},
+#if 0
{test_ntlmv2_ntlmv2_broken, NTLMv2 and LMv2, NTLMv2 broken, False},
+#endif
 #if 0
{test_ntlmv2_ntlmv2_broken_no_dom, NTLMv2 and LMv2, NTLMv2 broken (no 
domain), False},
 #endif



svn commit: samba r8853 - in branches/SAMBA_4_0/source/build/m4: .

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-29 23:33:11 + (Fri, 29 Jul 2005)
New Revision: 8853

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8853

Log:
fixed path to smb.conf

Jelmer, is this what you intended?

Modified:
   branches/SAMBA_4_0/source/build/m4/check_path.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_path.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_path.m42005-07-29 23:31:44 UTC 
(rev 8852)
+++ branches/SAMBA_4_0/source/build/m4/check_path.m42005-07-29 23:33:11 UTC 
(rev 8853)
@@ -20,7 +20,7 @@
 privatedir=\${CONFIGDIR}/private
 libdir=\${prefix}/lib/samba
 swatdir=\${DATADIR}/samba/swat,
-configdir=\${libdir}
+configdir=\${LIBDIR}
 logfilebase=\${localstatedir}
 lockdir=\${localstatedir}/locks
 piddir=\${localstatedir}/locks



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

2005-07-29 Thread abartlet
Author: abartlet
Date: 2005-07-29 23:39:11 + (Fri, 29 Jul 2005)
New Revision: 8854

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8854

Log:
#if 0 out the right things this time.  (Sorry about the build breakage)

Use  for the no domain case.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c2005-07-29 23:33:11 UTC 
(rev 8853)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c2005-07-29 23:39:11 UTC 
(rev 8854)
@@ -722,7 +722,7 @@
case NO_DOMAIN:
/* TODO - test with various domain cases, and without domain */
if (!SMBNTLMv2encrypt(samlogon_state-mem_ctx, 
- samlogon_state-account_name, NULL,
+ samlogon_state-account_name, ,
  samlogon_state-password, 
samlogon_state-chall,
  names_blob,
  lmv2_response, ntlmv2_response, 
@@ -894,17 +894,17 @@
return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_LM, NO_DOMAIN, 
error_string);
 }
 
-#if 0
 static BOOL test_ntlmv2_ntlmv2_broken(struct samlogon_state *samlogon_state, 
char **error_string) 
 {
return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_NT, UPPER_DOMAIN, 
error_string);
 }
-#endif
 
+#if 0
 static BOOL test_ntlmv2_ntlmv2_broken_no_dom(struct samlogon_state 
*samlogon_state, char **error_string) 
 {
return test_lmv2_ntlmv2_broken(samlogon_state, BREAK_NT, NO_DOMAIN, 
error_string);
 }
+#endif
 
 static BOOL test_ntlmv2_both_broken(struct samlogon_state *samlogon_state, 
char **error_string) 
 {
@@ -1146,9 +1146,7 @@
{test_lmv2_no_dom, LMv2 (no domain), False},
{test_ntlmv2_lmv2_broken, NTLMv2 and LMv2, LMv2 broken, False},
{test_ntlmv2_lmv2_broken_no_dom, NTLMv2 and LMv2, LMv2 broken (no 
domain), False},
-#if 0
{test_ntlmv2_ntlmv2_broken, NTLMv2 and LMv2, NTLMv2 broken, False},
-#endif
 #if 0
{test_ntlmv2_ntlmv2_broken_no_dom, NTLMv2 and LMv2, NTLMv2 broken (no 
domain), False},
 #endif



Build status as of Sat Jul 30 00:00:02 2005

2005-07-29 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2005-07-29 
00:00:14.0 +
+++ /home/build/master/cache/broken_results.txt 2005-07-30 00:00:16.0 
+
@@ -1,16 +1,16 @@
-Build status as of Fri Jul 29 00:00:01 2005
+Build status as of Sat Jul 30 00:00:02 2005
 
 Build counts:
 Tree Total  Broken Panic 
-ccache   35 7  0 
-distcc   35 5  0 
+ccache   34 6  0 
+distcc   34 5  0 
 lorikeet-heimdal 32 10 0 
 ppp  20 2  0 
-rsync35 3  0 
+rsync33 2  0 
 samba-docs   0  0  0 
-samba4   36 12 0 
-samba_3_035 5  0 
-smb-build31 4  0 
-talloc   33 11 0 
-tdb  34 16 0 
+samba4   36 32 0 
+samba_3_034 5  0 
+smb-build30 4  0 
+talloc   33 12 0 
+tdb  33 15 0 
 


svn commit: samba r8855 - in branches/SAMBA_4_0/source/librpc/idl: .

2005-07-29 Thread abartlet
Author: abartlet
Date: 2005-07-30 00:14:48 + (Sat, 30 Jul 2005)
New Revision: 8855

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8855

Log:
Share this enum (describing the SamSync databases) between nbt and netlogon.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/librpc/idl/misc.idl
   branches/SAMBA_4_0/source/librpc/idl/nbt.idl
   branches/SAMBA_4_0/source/librpc/idl/netlogon.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/misc.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/misc.idl   2005-07-29 23:39:11 UTC 
(rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/misc.idl   2005-07-30 00:14:48 UTC 
(rev 8855)
@@ -31,4 +31,13 @@
SEC_CHAN_DOMAIN  = 4,
SEC_CHAN_BDC = 6
} netr_SchannelType;
+
+   /* SAM database types */
+   typedef [public,v1_enum] enum {
+   SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
+   SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
+   SAM_DATABASE_PRIVS   = 2 /* Privileges */
+   } netr_SamDatabaseID;
+
+
 }

Modified: branches/SAMBA_4_0/source/librpc/idl/nbt.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/nbt.idl2005-07-29 23:39:11 UTC 
(rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/nbt.idl2005-07-30 00:14:48 UTC 
(rev 8855)
@@ -405,11 +405,13 @@
uint16   lm20_token;
} nbt_netlogon_response_from_pdc2;
 
+   declare enum netr_SamDatabaseID;
+
/* announce change to UAS or SAM */
typedef struct {
-   uint32   db_index;
-   hyperserial;
-   NTTIME   timestamp;
+   netr_SamDatabaseID   db_index;
+   hyperserial;
+   NTTIME   timestamp;
} nbt_db_change;
 
/* used to announce SAM changes */

Modified: branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/netlogon.idl   2005-07-29 23:39:11 UTC 
(rev 8854)
+++ branches/SAMBA_4_0/source/librpc/idl/netlogon.idl   2005-07-30 00:14:48 UTC 
(rev 8855)
@@ -291,12 +291,7 @@
/*/
/* Function 0x07 */
 
-   /* SAM database types */
-   typedef [v1_enum] enum {
-   SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
-   SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
-   SAM_DATABASE_PRIVS   = 2 /* Privileges */
-   } netr_SamDatabaseID;
+   declare enum netr_SamDatabaseID;
 
typedef struct {
unistr *account_name;



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

2005-07-29 Thread brad
Author: brad
Date: 2005-07-30 01:20:33 + (Sat, 30 Jul 2005)
New Revision: 8856

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8856

Log:
I think I have the ldb code down in test_CompleteJoin (not complete yet though)
Modified:
   branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c  2005-07-30 00:14:48 UTC 
(rev 8855)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c  2005-07-30 01:20:33 UTC 
(rev 8856)
@@ -321,12 +321,8 @@
 static BOOL test_CompleteJoin(struct DsSyncTest *ctx)
 {
NTSTATUS status;
-   //const char *ldif;
-   // * struct ldap_message *req, *rep;
BOOL ret = True;
int rtn;
-   //struct ldb_message *ldb_msg;
-   //struct ldb_ldif *ldb_req;

rtn = ldb_connect(ctx-ldb_ctx,ctx-ldap_url,0,NULL);
if (rtn != 0) {
@@ -346,33 +342,23 @@
//  userAccountControl: %u\n,
//  ctx-new_dc.dc_info2.computer_dn,
//  UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
-   //printf(dn: %s.\n,ctx-new_dc.dc_info2.computer_dn);
-   //ldb_req = ldb_ldif_read_string(ldb_ctx,ldif);
-   // * req = ldap_ldif2msg(ctx, ldif);
-   // * req-type = LDAP_TAG_ModifyRequest;
-   // * req-r.ModifyRequest.dn = ctx-new_dc.dc_info2.computer_dn;
-   // * req-r.ModifyRequest.num_mods = 1;
-   // * req-r.ModifyRequest.mods-type = LDAP_MODIFY_REPLACE;
-   // * req-r.ModifyRequest.mods-attrib.flags = LDB_FLAG_MOD_REPLACE;
-   // * req-r.ModifyRequest.mods-attrib.name = userAccountControl;
-   // * req-r.ModifyRequest.mods-attrib.num_values = 1;
-   // * req-r.ModifyRequest.mods-attrib.values-data = 
UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;
-   // * req-r.ModifyRequest.mods-attrib.values-length = 
sizeof(req-r.ModifyRequest.mods-attrib.values-data);

 // = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;
+
+   ctx-ldb_msg = ldb_msg_new(ctx);
+   
ldb_msg_add_fmt(ctx-ldb_ctx,ctx-ldb_msg,userAccountControl,%u,UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
 
ctx-ldb_msg-dn = ctx-new_dc.dc_info2.computer_dn;
-   ctx-ldb_msg-num_elements = 1;
ctx-ldb_msg-elements-flags = LDB_FLAG_MOD_REPLACE;
-   ctx-ldb_msg-elements-name = userAccountControl;
-   ctx-ldb_msg-elements-num_values = 1;
-   ctx-ldb_msg-elements-values-data = 
UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;
-   
+
rtn = ldb_modify(ctx-ldb_ctx,ctx-ldb_msg);
if (rtn != 0) {
printf(test_CompleteJoin() ldb_modify() failed: %s.\n,
 ldb_errstring(ctx-ldb_ctx));
return False;
}
+   printf(ldb_modify() succeeded.\n);
+   ldb_msg_free(ctx-ldb_ctx,ctx-ldb_msg);
+
// * rtn = ldap_transaction(ctx-admin.ldap.conn, req);
 
/* add entry CN=NETBIOSNAME,CN=Servers
@@ -392,7 +378,9 @@
ctx-new_dc.dc_info2.computer_dn);  
ldb_req = ldb_ldif_read_string(ldb_ctx,ldif);  
*/
+
printf(dn: %s\nserverReference: 
%s.\n,ctx-new_dc.dc_info2.server_dn,ctx-new_dc.dc_info2.computer_dn);
+
 // *   req = ldap_ldif2msg(ctx, ldif);
 // *   req-type = LDAP_TAG_AddRequest;
 // *   req.r.AddRequest.dn = ctx-new_dc.dc_info2.server_dn;
@@ -412,15 +400,22 @@
 // *   req.r.AddRequest.attributes.name = 'serverReference';
 // *   req.r.AddRequest.attributes.num_values = 1;
 // *   req.r.AddRequest.attributes.values = ctx-new_dc.dc_info2.computer_dn;
-   printf(test\n);
+
//rtn = ldb_modify(ldb_ctx,ldb_req-msg);
+   ctx-ldb_msg = ldb_msg_new(ctx);
+   ldb_msg_add_string(ctx-ldb_ctx,ctx-ldb_msg,objectClass,server);
+   ldb_msg_add_string(ctx-ldb_ctx,ctx-ldb_msg,systemFlags,5000);
+   
ldb_msg_add_string(ctx-ldb_ctx,ctx-ldb_msg,serverReference,ctx-new_dc.dc_info2.computer_dn);
+   ctx-ldb_msg-dn = ctx-new_dc.dc_info2.server_dn;
+   ctx-ldb_msg-elements-flags = LDB_FLAG_MOD_REPLACE;
+   
rtn = ldb_add(ctx-ldb_ctx,ctx-ldb_msg);
if (rtn != 0) {
printf(test_CompleteJoin(): ldb_add() failed: %s.\n,
 ldb_errstring(ctx-ldb_ctx));
return False;
}
-   printf(test2\n);
+   printf(ldb_add() succeeded.\n);
// rtn = ldap_transaction(ctx-admin.ldap.conn, req);
 
/* add entry CN=NTDS Settings
@@ -805,11 +800,13 @@

mem_ctx = talloc_init(torture_rpc_dssync);
ctx = test_create_context(mem_ctx);
+   ctx-ldb_ctx = ldb_init(mem_ctx);
+   //ctx-ldb_msg = talloc_init(ldb_message);

 // url = talloc_asprintf(mem_ctx, ldap://%s/,host);
 
 // ldb method  
-   ctx-ldb_ctx = ldb_init(mem_ctx);
+   
//printf(ctx-ldap_url: %s.\n,ctx-ldap_url);
rtn = 

Re: svn commit: samba r8856 - in branches/SOC/SAMBA_4_0/source/torture/rpc: .

2005-07-29 Thread Richard Sharpe
On Sat, 30 Jul 2005 [EMAIL PROTECTED] wrote:

 Author: brad
 Date: 2005-07-30 01:20:33 + (Sat, 30 Jul 2005)
 New Revision: 8856

 WebSVN: 
 http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8856

 Log:
 I think I have the ldb code down in test_CompleteJoin (not complete yet 
 though)
 Modified:
 @@ -346,33 +342,23 @@
   //  userAccountControl: %u\n,
   //  ctx-new_dc.dc_info2.computer_dn,

Hmmm, I thought we preferred to avoid C++ style comments in our C code?

Regards
-
Richard Sharpe, rsharpe[at]richardsharpe.com, rsharpe[at]samba.org,
sharpe[at]ethereal.com, http://www.richardsharpe.com


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

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-30 02:02:52 + (Sat, 30 Jul 2005)
New Revision: 8857

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8857

Log:
please don't get fancy with embedded boolean statements in js
code. Especially as this is a new language for most Samba developers,
it is far better to err strongly on the side of readability rather
than trying to save a line of code by using fancy tricks

Modified:
   branches/SAMBA_4_0/source/setup/provision


Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision
===
--- branches/SAMBA_4_0/source/setup/provision   2005-07-30 01:20:33 UTC (rev 
8856)
+++ branches/SAMBA_4_0/source/setup/provision   2005-07-30 02:02:52 UTC (rev 
8857)
@@ -106,8 +106,10 @@
subobj[key] = options[r];
 }
 
+var blank = (options[blank] != undefined);
+
 message(Provisioning for %s in realm %s\n, subobj.DOMAIN, subobj.REALM);
 message(Using administrator password: %s\n, subobj.ADMINPASS);
-provision(subobj, message, options[blank] != undefined);
+provision(subobj, message, blank);
 message(All OK\n);
 return 0;



svn commit: smb-build r16 - in trunk/testprog: .

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-30 03:30:01 + (Sat, 30 Jul 2005)
New Revision: 16

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=16

Log:
deliberately break the build to test the new build breakage emails

Modified:
   trunk/testprog/testprog.c


Changeset:
Modified: trunk/testprog/testprog.c
===
--- trunk/testprog/testprog.c   2005-07-13 09:29:14 UTC (rev 15)
+++ trunk/testprog/testprog.c   2005-07-30 03:30:01 UTC (rev 16)
@@ -4,6 +4,8 @@
 #error the build hacks don't work
 #endif
 
+#error the build is now broken
+
  int main(int argc,char *argv[])
 {
printf(I'm a happy test program\n);



svn commit: smb-build r17 - in trunk/testprog: .

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-30 03:43:32 + (Sat, 30 Jul 2005)
New Revision: 17

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=smb-buildrev=17

Log:
and fix it again ...



Modified:
   trunk/testprog/testprog.c


Changeset:
Modified: trunk/testprog/testprog.c
===
--- trunk/testprog/testprog.c   2005-07-30 03:30:01 UTC (rev 16)
+++ trunk/testprog/testprog.c   2005-07-30 03:43:32 UTC (rev 17)
@@ -4,8 +4,6 @@
 #error the build hacks don't work
 #endif
 
-#error the build is now broken
-
  int main(int argc,char *argv[])
 {
printf(I'm a happy test program\n);



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

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-30 03:47:59 + (Sat, 30 Jul 2005)
New Revision: 8858

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8858

Log:
just to make sure it works on the main trees, deliberately break the samba4 
build

I expect to get a flood of nastygrams from [EMAIL PROTECTED] for this 

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2005-07-30 02:02:52 UTC (rev 
8857)
+++ branches/SAMBA_4_0/source/torture/torture.c 2005-07-30 03:47:59 UTC (rev 
8858)
@@ -1,3 +1,5 @@
+#error remove this line to fix the build
+
 /* 
Unix SMB/CIFS implementation.
SMB torture tester



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

2005-07-29 Thread tridge
Author: tridge
Date: 2005-07-30 03:59:17 + (Sat, 30 Jul 2005)
New Revision: 8859

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8859

Log:
having been successfully mailbombed by [EMAIL PROTECTED], fix the build again

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/torture.c
===
--- branches/SAMBA_4_0/source/torture/torture.c 2005-07-30 03:47:59 UTC (rev 
8858)
+++ branches/SAMBA_4_0/source/torture/torture.c 2005-07-30 03:59:17 UTC (rev 
8859)
@@ -1,5 +1,3 @@
-#error remove this line to fix the build
-
 /* 
Unix SMB/CIFS implementation.
SMB torture tester



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

2005-07-29 Thread brad
Author: brad
Date: 2005-07-30 05:08:13 + (Sat, 30 Jul 2005)
New Revision: 8860

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=8860

Log:
Changed comments to C style /**/ (thanks Richard), some more changes to 
test_CompleteJoin(). 
Modified:
   branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c


Changeset:
Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c
===
--- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c  2005-07-30 03:59:17 UTC 
(rev 8859)
+++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c  2005-07-30 05:08:13 UTC 
(rev 8860)
@@ -151,13 +151,14 @@
ldb_errstring(ctx-ldb_ctx));
return;
}
-   // * req = ldap_ldif2msg(ctx, ldif);
-   // * req.messageid = ;
-   //req-type = LDAP_TAG_DelRequest;
-   //req-r.DelRequest.dn = ctx-new_dc.dc_info2.ntds_dn;
-   // * req.num_controls = ;
-   // * req.controls = ;
-   //rtn = ldap_transaction(ctx-admin.ldap.conn, req);
+   /* req = ldap_ldif2msg(ctx, ldif);
+req.messageid = ;
+req-type = LDAP_TAG_DelRequest;
+req-r.DelRequest.dn = ctx-new_dc.dc_info2.ntds_dn;
+req.num_controls = ;
+req.controls = ;
+   rtn = ldap_transaction(ctx-admin.ldap.conn, req);
+   */
}
 
{
@@ -177,10 +178,12 @@
ldb_errstring(ctx-ldb_ctx));
return;
}
-   //req = ldap_ldif2msg(ctx, ldif);
-   //req-type = LDAP_TAG_DelRequest;
-   //req-r.DelRequest.dn = ctx-new_dc.dc_info2.ntds_dn;
-   //rtn = ldap_transaction(ctx-admin.ldap.conn, req);
+   /*
+   req = ldap_ldif2msg(ctx, ldif);
+   req-type = LDAP_TAG_DelRequest;
+   req-r.DelRequest.dn = ctx-new_dc.dc_info2.ntds_dn;
+   rtn = ldap_transaction(ctx-admin.ldap.conn, req);
+   */
}
 
if (ctx-new_dc.join) {
@@ -306,7 +309,7 @@
ctx-schema_dn = talloc_asprintf(ctx, CN=Schema,%s, ctx-config_dn);
 
ctx-new_dc.dc_info2.server_dn = talloc_asprintf(ctx,
-// 
CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s,
+/* 
CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s,
 */

CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s,
TEST_MACHINE_NAME, ctx-domain_dn);
 
@@ -333,17 +336,16 @@
printf(test_CompleteJoin(): Connected to %s.\n,ctx-ldap_url);

/* userAccountControl: 532480 0x82000 
-* UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION
-*/
-   //ldif = talloc_asprintf(ctx,
-   //  dn: %s\n
-   //  changetype: modify\n
-   //  replace: userAccountControl\n
-   //  userAccountControl: %u\n,
-   //  ctx-new_dc.dc_info2.computer_dn,
-   //  UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
-   
-// = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;
+* UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION 
+   ldif = talloc_asprintf(ctx,
+   dn: %s\n
+   changetype: modify\n
+   replace: userAccountControl\n
+   userAccountControl: %u\n,
+   ctx-new_dc.dc_info2.computer_dn,
+   UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
+   */
+/* = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION;*/
 
ctx-ldb_msg = ldb_msg_new(ctx);

ldb_msg_add_fmt(ctx-ldb_ctx,ctx-ldb_msg,userAccountControl,%u,UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION);
 
@@ -359,7 +361,7 @@
printf(ldb_modify() succeeded.\n);
ldb_msg_free(ctx-ldb_ctx,ctx-ldb_msg);
 
-   // * rtn = ldap_transaction(ctx-admin.ldap.conn, req);
+   /* rtn = ldap_transaction(ctx-admin.ldap.conn, req); */
 
/* add entry CN=NETBIOSNAME,CN=Servers
 * objectClass: server
@@ -381,27 +383,6 @@
 
printf(dn: %s\nserverReference: 
%s.\n,ctx-new_dc.dc_info2.server_dn,ctx-new_dc.dc_info2.computer_dn);
 
-// *   req = ldap_ldif2msg(ctx, ldif);
-// *   req-type = LDAP_TAG_AddRequest;
-// *   req.r.AddRequest.dn = ctx-new_dc.dc_info2.server_dn;
-// *   req.r.AddRequest.num_attributes = 3;
-   
-// *   req.r.AddRequest.attributes.flags = LDB_FLAG_MOD_ADD;
-// *   req.r.AddRequest.attributes.name = 'objectClass';
-// *   req.r.AddRequest.attributes.num_values = 1;
-// *   req.r.AddRequest.attributes.values = 'server';
-   
-// *   req.r.AddRequest.attributes.flags = LDB_FLAG_MOD_ADD;
-// *   req.r.AddRequest.attributes.name = 'systemFlags';
-// *   req.r.AddRequest.attributes.num_values = 1;
-// *