svn commit: samba r25296 - in branches/SAMBA_4_0/source/torture/raw: .
Author: vlendec
Date: 2007-09-22 09:22:58 + (Sat, 22 Sep 2007)
New Revision: 25296
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25296
Log:
Apply patch by Elrond [EMAIL PROTECTED]: Put
__location__ into a few printfs.
Thanks,
Volker
Modified:
branches/SAMBA_4_0/source/torture/raw/composite.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/composite.c
===
--- branches/SAMBA_4_0/source/torture/raw/composite.c 2007-09-21 16:15:47 UTC
(rev 25295)
+++ branches/SAMBA_4_0/source/torture/raw/composite.c 2007-09-22 09:22:58 UTC
(rev 25296)
@@ -68,7 +68,7 @@
status = smb_composite_savefile(cli-tree, io1);
if (!NT_STATUS_IS_OK(status)) {
- printf(savefile failed: %s\n, nt_errstr(status));
+ printf((%s) savefile failed: %s\n,
__location__,nt_errstr(status));
return False;
}
@@ -88,7 +88,7 @@
while (*count != num_ops) {
event_loop_once(cli-transport-socket-event.ctx);
if (lp_parm_bool(NULL, torture, progress, true)) {
- printf(count=%d\r, *count);
+ printf((%s) count=%d\r, __location__, *count);
fflush(stdout);
}
}
@@ -97,18 +97,18 @@
for (i=0;inum_ops;i++) {
status = smb_composite_loadfile_recv(c[i], mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- printf(loadfile[%d] failed - %s\n, i,
nt_errstr(status));
+ printf((%s) loadfile[%d] failed - %s\n, __location__,
i, nt_errstr(status));
return False;
}
if (io2.out.size != len) {
- printf(wrong length in returned data - %d should be
%d\n,
+ printf((%s) wrong length in returned data - %d should
be %d\n,__location__,
io2.out.size, (int)len);
return False;
}
if (memcmp(io2.out.data, data, len) != 0) {
- printf(wrong data in loadfile!\n);
+ printf((%s) wrong data in loadfile!\n,__location__);
return False;
}
}
@@ -148,7 +148,7 @@
status = smb_composite_savefile(cli-tree, io1);
if (!NT_STATUS_IS_OK(status)) {
- printf(savefile failed: %s\n, nt_errstr(status));
+ printf((%s) savefile failed: %s\n,__location__,
nt_errstr(status));
return False;
}
@@ -178,7 +178,7 @@
while (*count != torture_numops) {
event_loop_once(event_ctx);
if (lp_parm_bool(NULL, torture, progress, true)) {
- printf(count=%d\r, *count);
+ printf((%s) count=%d\r, __location__, *count);
fflush(stdout);
}
}
@@ -187,22 +187,22 @@
for (i=0;itorture_numops;i++) {
status = smb_composite_fetchfile_recv(c[i], mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- printf(loadfile[%d] failed - %s\n, i,
+ printf((%s) loadfile[%d] failed - %s\n, __location__,
i,
nt_errstr(status));
ret = False;
continue;
}
if (io2.out.size != len) {
- printf(wrong length in returned data - %d
- should be %d\n,
+ printf((%s) wrong length in returned data - %d
+ should be %d\n, __location__,
io2.out.size, (int)len);
ret = False;
continue;
}
if (memcmp(io2.out.data, data, len) != 0) {
- printf(wrong data in loadfile!\n);
+ printf((%s) wrong data in loadfile!\n, __location__);
ret = False;
continue;
}
@@ -243,7 +243,7 @@
status = smb_composite_savefile(cli-tree, io1);
if (!NT_STATUS_IS_OK(status)) {
- printf(savefile failed: %s\n, nt_errstr(status));
+ printf((%s) savefile failed: %s\n, __location__,
nt_errstr(status));
return False;
}
@@ -252,7 +252,7 @@
io_orig[i]-in.sd = security_descriptor_initialise(io_orig[i]);
status = smb_composite_appendacl(cli-tree, io_orig[i],
io_orig[i]);
if (!NT_STATUS_IS_OK(status)) {
- printf(appendacl failed: %s\n, nt_errstr(status));
+ printf((%s) appendacl failed: %s\n,
svn commit: samba r25297 - in branches/SAMBA_4_0/source/script: .
Author: metze Date: 2007-09-22 09:42:38 + (Sat, 22 Sep 2007) New Revision: 25297 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25297 Log: - fix sed arguments to make the replacement work - always add #include config.h in the first line metze Modified: branches/SAMBA_4_0/source/script/lex_compile.sh Changeset: Modified: branches/SAMBA_4_0/source/script/lex_compile.sh === --- branches/SAMBA_4_0/source/script/lex_compile.sh 2007-09-22 09:22:58 UTC (rev 25296) +++ branches/SAMBA_4_0/source/script/lex_compile.sh 2007-09-22 09:42:38 UTC (rev 25297) @@ -35,8 +35,14 @@ if [ -r $base.yy.c ];then # we must guarantee that config.h comes first echo #include \config.h\ $base.c - sed '/^#/ s|$base.yy\.c|$DEST|' $base.yy.c $base.c + sed -e s|$base\.yy\.c|$DEST| $base.yy.c $base.c rm -f $base.yy.c + elif [ -r $base.c ];then + # we must guarantee that config.h comes first + mv $base.c $base.c.tmp + echo #include \config.h\ $base.c + sed -e s|$base\.yy\.c|$DEST| $base.c.tmp $base.c + rm -f $base.c.tmp elif [ ! -r base.c ]; then echo $base.c nor $base.yy.c generated. exit 1
svn commit: samba r25298 - in branches/SAMBA_4_0/source/heimdal/lib: asn1 com_err
Author: metze
Date: 2007-09-22 09:44:29 + (Sat, 22 Sep 2007)
New Revision: 25298
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25298
Log:
regenerate lex.c files with config.h as first include
this should help on aix 5.3.
metze
Modified:
branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
===
--- branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-09-22 09:42:38 UTC
(rev 25297)
+++ branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-09-22 09:44:29 UTC
(rev 25298)
@@ -1,5 +1,6 @@
+#include config.h
-#line 3 lex.c
+#line 3 heimdal/lib/asn1/lex.c
#define YY_INT_ALIGNED short int
@@ -342,9 +343,6 @@
typedef int yy_state_type;
extern int yylineno;
-
-int yylineno = 1;
-
extern char *yytext;
#define yytext_ptr yytext
@@ -826,7 +824,7 @@
* SUCH DAMAGE.
*/
-/* $Id: lex.l 18738 2006-10-21 11:57:22Z lha $ */
+/* $Id: lex.l,v 1.31 2006/10/21 11:57:22 lha Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -851,7 +849,7 @@
static void unterminated(const char *, unsigned);
/* This is for broken old lexes (solaris 10 and hpux) */
-#line 855 lex.c
+#line 852 heimdal/lib/asn1/lex.c
#define INITIAL 0
@@ -1006,7 +1004,7 @@
#line 68 lex.l
-#line 1010 lex.c
+#line 1007 heimdal/lib/asn1/lex.c
if ( !(yy_init) )
{
@@ -1675,7 +1673,7 @@
#line 274 lex.l
ECHO;
YY_BREAK
-#line 1679 lex.c
+#line 1676 heimdal/lib/asn1/lex.c
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2485,15 +2483,6 @@
/* Accessor methods (get/set functions) to struct members. */
-/** Get the current line number.
- *
- */
-int yyget_lineno (void)
-{
-
-return yylineno;
-}
-
/** Get the input stream.
*
*/
@@ -2527,16 +2516,6 @@
return yytext;
}
-/** Set the current line number.
- * @param line_number
- *
- */
-void yyset_lineno (int line_number )
-{
-
-yylineno = line_number;
-}
-
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
Modified: branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c
===
--- branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c 2007-09-22 09:42:38 UTC
(rev 25297)
+++ branches/SAMBA_4_0/source/heimdal/lib/com_err/lex.c 2007-09-22 09:44:29 UTC
(rev 25298)
@@ -1,5 +1,6 @@
+#include config.h
-#line 3 lex.c
+#line 3 heimdal/lib/com_err/lex.c
#define YY_INT_ALIGNED short int
@@ -342,9 +343,6 @@
typedef int yy_state_type;
extern int yylineno;
-
-int yylineno = 1;
-
extern char *yytext;
#define yytext_ptr yytext
@@ -523,7 +521,7 @@
#include parse.h
#include lex.h
-RCSID($Id: lex.l 15143 2005-05-16 08:52:54Z lha $);
+RCSID($Id: lex.l,v 1.8 2005/05/16 08:52:54 lha Exp $);
static unsigned lineno = 1;
static int getstring(void);
@@ -532,7 +530,7 @@
#undef ECHO
-#line 536 lex.c
+#line 533 heimdal/lib/com_err/lex.c
#define INITIAL 0
@@ -687,7 +685,7 @@
#line 59 lex.l
-#line 691 lex.c
+#line 688 heimdal/lib/com_err/lex.c
if ( !(yy_init) )
{
@@ -851,7 +849,7 @@
#line 75 lex.l
ECHO;
YY_BREAK
-#line 855 lex.c
+#line 852 heimdal/lib/com_err/lex.c
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1661,15 +1659,6 @@
/* Accessor methods (get/set functions) to struct members. */
-/** Get the current line number.
- *
- */
-int yyget_lineno (void)
-{
-
-return yylineno;
-}
-
/** Get the input stream.
*
*/
@@ -1703,16 +1692,6 @@
return yytext;
}
-/** Set the current line number.
- * @param line_number
- *
- */
-void yyset_lineno (int line_number )
-{
-
-yylineno = line_number;
-}
-
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
svn commit: samba r25299 - in branches/SAMBA_4_0/source: ldap_server scripting/libjs selftest/env setup
Author: abartlet
Date: 2007-09-22 12:57:17 + (Sat, 22 Sep 2007)
New Revision: 25299
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25299
Log:
Modify the provision script to take an additional argument: --server-role
This must be set to either 'domain controller', 'domain member' or 'standalone'.
The default for the provision now changes to 'standalone'.
This is not because Samba4 is particularlly useful in that mode, but
because we still want a positive sign from the administrator that we
should advertise as a DC.
We now do more to ensure the 'standalone' and 'member server'
provision output is reasonable, and try not to set odd things into the
database that only belong for the DC.
Andrew Bartlett
Added:
branches/SAMBA_4_0/source/setup/provision.smb.conf.dc
branches/SAMBA_4_0/source/setup/provision.smb.conf.member
branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone
branches/SAMBA_4_0/source/setup/secrets_dc.ldif
Removed:
branches/SAMBA_4_0/source/setup/provision.smb.conf
Modified:
branches/SAMBA_4_0/source/ldap_server/ldap_server.c
branches/SAMBA_4_0/source/scripting/libjs/provision.js
branches/SAMBA_4_0/source/selftest/env/Samba4.pm
branches/SAMBA_4_0/source/setup/named.conf
branches/SAMBA_4_0/source/setup/provision
branches/SAMBA_4_0/source/setup/provision_self_join.ldif
branches/SAMBA_4_0/source/setup/provision_users.ldif
branches/SAMBA_4_0/source/setup/secrets.ldif
Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2007-09-22 09:44:29 UTC
(rev 25298)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2007-09-22 12:57:17 UTC
(rev 25299)
@@ -513,6 +513,18 @@
NTSTATUS status;
const struct model_ops *model_ops;
+ switch (lp_server_role()) {
+ case ROLE_STANDALONE:
+ task_server_terminate(task, ldap_server: no LDAP server
required in standalone configuration);
+ return;
+ case ROLE_DOMAIN_MEMBER:
+ task_server_terminate(task, ldap_server: no LDAP server
required in member server configuration);
+ return;
+ case ROLE_DOMAIN_CONTROLLER:
+ /* Yes, we want an LDAP server */
+ break;
+ }
+
task_server_set_title(task, task[ldapsrv]);
/* run the ldap server as a single process */
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-09-22
09:44:29 UTC (rev 25298)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-09-22
12:57:17 UTC (rev 25299)
@@ -489,6 +489,17 @@
subobj.NETLOGONPATH = paths.netlogon;
subobj.SYSVOLPATH = paths.sysvol;
+ if (subobj.DOMAIN_CONF == undefined) {
+ subobj.DOMAIN_CONF = subobj.DOMAIN;
+ }
+ if (subobj.REALM_CONF == undefined) {
+ subobj.REALM_CONF = subobj.REALM;
+ }
+ if (subobj.SERVERROLE != domain controller) {
+ subobj.REALM = subobj.HOSTNAME;
+ subobj.DOMAIN = subobj.HOSTNAME;
+ }
+
return true;
}
@@ -536,6 +547,8 @@
setup_ldb(secrets.ldif, info, paths.secrets, false);
+ setup_ldb(secrets_dc.ldif, info, paths.secrets, false);
+
return true;
}
@@ -571,8 +584,16 @@
/* only install a new smb.conf if there isn't one there already */
var st = sys.stat(paths.smbconf);
if (st == undefined) {
+ var smbconfsuffix;
+ if (subobj.ROLE == domain controller) {
+ smbconfsuffix = dc;
+ } else if (subobj.ROLE == member server) {
+ smbconfsuffix = member;
+ } else {
+ smbconfsuffix = subobj.ROLE;
+ }
message(Setting up + paths.smbconf +\n);
- setup_file(provision.smb.conf, info.message, paths.smbconf,
subobj);
+ setup_file(provision.smb.conf. + smbconfsuffix, info.message,
paths.smbconf, subobj);
lp.reload();
}
/* only install a new shares config db if there is none */
@@ -724,7 +745,7 @@
message(Setting up sam.ldb users and groups\n);
setup_add_ldif(provision_users.ldif, info, samdb, false);
- if (lp.get(server role) == domain controller) {
+ if (subobj.SERVERROLE == domain controller) {
message(Setting up self join\n);
setup_add_ldif(provision_self_join.ldif, info, samdb, false);
setup_add_ldif(provision_group_policy.ldif, info, samdb,
false);
@@ -737,6 +758,9 @@
sys.mkdir(paths.sysvol + /+ subobj.DNSDOMAIN + /Policies/{
+ subobj.POLICYGUID + }/User, 0755);
svn commit: samba r25300 - in branches/SAMBA_4_0: .
Author: abartlet Date: 2007-09-22 12:57:50 + (Sat, 22 Sep 2007) New Revision: 25300 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25300 Log: Update howto.txt with modified provision syntax. Andrew Bartlett Modified: branches/SAMBA_4_0/howto.txt Changeset: Modified: branches/SAMBA_4_0/howto.txt === --- branches/SAMBA_4_0/howto.txt2007-09-22 12:57:17 UTC (rev 25299) +++ branches/SAMBA_4_0/howto.txt2007-09-22 12:57:50 UTC (rev 25300) @@ -74,7 +74,8 @@ Must be run as a user with permission to write to the install directory. # cd source - # ./setup/provision --realm=YOUR.REALM --domain=YOURDOM --adminpass=SOMEPASSWORD + # ./setup/provision --realm=YOUR.REALM --domain=YOURDOM \ + # --adminpass=SOMEPASSWORD --server-role='domain controller' REMINDER: Add the bin directory of the path you installed to (e.g. /usr/local/samba/bin) to your path, or the provision command
Build status as of Sun Sep 23 00:00:03 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-09-22 00:01:52.0 + +++ /home/build/master/cache/broken_results.txt 2007-09-23 00:01:47.0 + @@ -1,4 +1,4 @@ -Build status as of Sat Sep 22 00:00:03 2007 +Build status as of Sun Sep 23 00:00:03 2007 Build counts: Tree Total Broken Panic @@ -13,11 +13,11 @@ pidl 18 4 0 ppp 11 8 0 python 0 0 0 -rsync32 16 0 +rsync32 13 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 29 18 2 -samba_3_232 17 0 +samba4 29 17 2 +samba_3_232 16 0 smb-build29 30 0 talloc 32 1 0 tdb 32 3 0
