svn commit: samba r25350 - in branches/SAMBA_4_0/source/torture/winbind: .
Author: obnox
Date: 2007-09-26 16:46:20 + (Wed, 26 Sep 2007)
New Revision: 25350
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25350
Log:
Add an initial winbindd list-users test.
Michael
Modified:
branches/SAMBA_4_0/source/torture/winbind/struct_based.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/winbind/struct_based.c
===
--- branches/SAMBA_4_0/source/torture/winbind/struct_based.c2007-09-26
04:53:16 UTC (rev 25349)
+++ branches/SAMBA_4_0/source/torture/winbind/struct_based.c2007-09-26
16:46:20 UTC (rev 25350)
@@ -555,6 +555,21 @@
return true;
}
+static bool torture_winbind_struct_list_users(struct torture_context *torture)
+{
+ struct winbindd_request req;
+ struct winbindd_response rep;
+
+ torture_comment(torture, Running WINBINDD_LIST_USERS (struct
based)\n);
+
+ ZERO_STRUCT(req);
+ ZERO_STRUCT(rep);
+
+ DO_STRUCT_REQ_REP(WINBINDD_LIST_USERS, req, rep);
+
+ return true;
+}
+
struct torture_suite *torture_winbind_struct_init(void)
{
struct torture_suite *suite =
torture_suite_create(talloc_autofree_context(), STRUCT);
@@ -570,6 +585,7 @@
torture_suite_add_simple_test(suite, DOMAIN_INFO,
torture_winbind_struct_domain_info);
torture_suite_add_simple_test(suite, GETDCNAME,
torture_winbind_struct_getdcname);
torture_suite_add_simple_test(suite, DSGETDCNAME,
torture_winbind_struct_dsgetdcname);
+ torture_suite_add_simple_test(suite, LIST_USERS,
torture_winbind_struct_list_users);
suite-description = talloc_strdup(suite, WINBIND - struct based
protocol tests);
svn commit: samba r25351 - in branches/SAMBA_4_0/source/libcli: .
Author: tridge Date: 2007-09-26 16:52:50 + (Wed, 26 Sep 2007) New Revision: 25351 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25351 Log: disable swig for now to get the build working Modified: branches/SAMBA_4_0/source/libcli/config.mk Changeset: Modified: branches/SAMBA_4_0/source/libcli/config.mk === --- branches/SAMBA_4_0/source/libcli/config.mk 2007-09-26 16:46:20 UTC (rev 25350) +++ branches/SAMBA_4_0/source/libcli/config.mk 2007-09-26 16:52:50 UTC (rev 25351) @@ -58,6 +58,7 @@ LIBRARY_REALNAME = swig/_libcli_nbt.$(SHLIBEXT) OBJ_FILES = swig/libcli_nbt_wrap.o PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG +ENABLE = NO [LIBRARY::swig_libcli_smb] LIBRARY_REALNAME = swig/_libcli_smb.$(SHLIBEXT)
svn commit: samba r25352 - in branches/SAMBA_4_0/source/torture/winbind: .
Author: obnox
Date: 2007-09-26 16:53:35 + (Wed, 26 Sep 2007)
New Revision: 25352
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25352
Log:
Add a basic WINBINDD_LIST_GROUPS test.
Michael
Modified:
branches/SAMBA_4_0/source/torture/winbind/struct_based.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/winbind/struct_based.c
===
--- branches/SAMBA_4_0/source/torture/winbind/struct_based.c2007-09-26
16:52:50 UTC (rev 25351)
+++ branches/SAMBA_4_0/source/torture/winbind/struct_based.c2007-09-26
16:53:35 UTC (rev 25352)
@@ -570,6 +570,21 @@
return true;
}
+static bool torture_winbind_struct_list_groups(struct torture_context *torture)
+{
+ struct winbindd_request req;
+ struct winbindd_response rep;
+
+ torture_comment(torture, Running WINBINDD_LIST_GROUPS (struct
based)\n);
+
+ ZERO_STRUCT(req);
+ ZERO_STRUCT(rep);
+
+ DO_STRUCT_REQ_REP(WINBINDD_LIST_GROUPS, req, rep);
+
+ return true;
+}
+
struct torture_suite *torture_winbind_struct_init(void)
{
struct torture_suite *suite =
torture_suite_create(talloc_autofree_context(), STRUCT);
@@ -586,6 +601,7 @@
torture_suite_add_simple_test(suite, GETDCNAME,
torture_winbind_struct_getdcname);
torture_suite_add_simple_test(suite, DSGETDCNAME,
torture_winbind_struct_dsgetdcname);
torture_suite_add_simple_test(suite, LIST_USERS,
torture_winbind_struct_list_users);
+ torture_suite_add_simple_test(suite, LIST_GROUPS,
torture_winbind_struct_list_groups);
suite-description = talloc_strdup(suite, WINBIND - struct based
protocol tests);
svn commit: samba r25353 - in branches/SAMBA_4_0/source/libcli: .
Author: mimir Date: 2007-09-26 17:39:39 + (Wed, 26 Sep 2007) New Revision: 25353 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25353 Log: Disable one more swig link to for 'make install' to work. rafal Modified: branches/SAMBA_4_0/source/libcli/config.mk Changeset: Modified: branches/SAMBA_4_0/source/libcli/config.mk === --- branches/SAMBA_4_0/source/libcli/config.mk 2007-09-26 16:53:35 UTC (rev 25352) +++ branches/SAMBA_4_0/source/libcli/config.mk 2007-09-26 17:39:39 UTC (rev 25353) @@ -64,6 +64,7 @@ LIBRARY_REALNAME = swig/_libcli_smb.$(SHLIBEXT) OBJ_FILES = swig/libcli_smb_wrap.o PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-CONFIG +ENABLE = NO [SUBSYSTEM::LIBCLI_DGRAM] OBJ_FILES = \
svn commit: samba r25354 - in branches/SAMBA_4_0/source: script setup
Author: abartlet
Date: 2007-09-26 17:43:15 + (Wed, 26 Sep 2007)
New Revision: 25354
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25354
Log:
Thanks to Amin Azez [EMAIL PROTECTED] for finally getting me to
fix a provision without an smb.conf already setup.
Andrew Bartlett
Added:
branches/SAMBA_4_0/source/setup/provision.smb.conf.standalone
Removed:
branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone
Modified:
branches/SAMBA_4_0/source/script/gdb_run
branches/SAMBA_4_0/source/script/installmisc.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/gdb_run
===
--- branches/SAMBA_4_0/source/script/gdb_run2007-09-26 17:39:39 UTC (rev
25353)
+++ branches/SAMBA_4_0/source/script/gdb_run2007-09-26 17:43:15 UTC (rev
25354)
@@ -8,7 +8,6 @@
cat EOF $TMPFILE
run
bt
-quit
EOF
trap /bin/rm -f $TMPFILE EXIT
Modified: branches/SAMBA_4_0/source/script/installmisc.sh
===
--- branches/SAMBA_4_0/source/script/installmisc.sh 2007-09-26 17:39:39 UTC
(rev 25353)
+++ branches/SAMBA_4_0/source/script/installmisc.sh 2007-09-26 17:43:15 UTC
(rev 25354)
@@ -25,6 +25,9 @@
cp setup/*.reg $SETUPDIR || exit 1
cp setup/*.zone $SETUPDIR || exit 1
cp setup/*.conf $SETUPDIR || exit 1
+cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
+cp setup/provision.smb.conf.member $SETUPDIR || exit 1
+cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
echo Installing script tools
mkdir -p $BINDIR
Copied: branches/SAMBA_4_0/source/setup/provision.smb.conf.standalone (from rev
25352, branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone)
Deleted: branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone
===
--- branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone
2007-09-26 17:39:39 UTC (rev 25353)
+++ branches/SAMBA_4_0/source/setup/provision.smb.conf.standlone
2007-09-26 17:43:15 UTC (rev 25354)
@@ -1,5 +0,0 @@
-[globals]
- netbios name= ${HOSTNAME}
- workgroup = ${DOMAIN_CONF}
- realm = ${REALM_CONF}
- server role = ${SERVERROLE}
svn commit: samba r25355 - in branches/SAMBA_3_2/source/client: .
Author: sfrench
Date: 2007-09-26 18:36:38 + (Wed, 26 Sep 2007)
New Revision: 25355
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25355
Log:
IP address parsing did not allow for fully expanded ipv6 addresses
(which can be 12 bytes longer than we were allowing for).
Thanks to Dr. David Holder
Modified:
branches/SAMBA_3_2/source/client/mount.cifs.c
Changeset:
Modified: branches/SAMBA_3_2/source/client/mount.cifs.c
===
--- branches/SAMBA_3_2/source/client/mount.cifs.c 2007-09-26 17:43:15 UTC
(rev 25354)
+++ branches/SAMBA_3_2/source/client/mount.cifs.c 2007-09-26 18:36:38 UTC
(rev 25355)
@@ -426,7 +426,7 @@
} else if (strncmp(data, ip, 2) == 0) {
if (!value || !*value) {
printf(target ip address argument missing);
- } else if (strnlen(value, 35) 35) {
+ } else if (strnlen(value, INET6_ADDRSTRLEN)
INET6_ADDRSTRLEN) {
if(verboseflag)
printf(ip address %s override
specified\n,value);
got_ip = 1;
svn commit: samba r25356 - in branches/SAMBA_4_0/source/libnet: .
Author: mimir Date: 2007-09-26 19:05:51 + (Wed, 26 Sep 2007) New Revision: 25356 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25356 Log: Conversion from the old-style composite functions take 2. Let's find out if NET-USERMOD test passes this time on the build farm... rafal Modified: branches/SAMBA_4_0/source/libnet/userman.c Changeset: Sorry, the patch is too large (910 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25356
svn commit: samba r25357 - in branches/3.2-perltest: . source
Author: jelmer
Date: 2007-09-26 19:19:56 + (Wed, 26 Sep 2007)
New Revision: 25357
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25357
Log:
Add non-build-farm-specific skip list
Added:
branches/3.2-perltest/source/samba3-skip-nobuildfarm
Modified:
branches/3.2-perltest/
branches/3.2-perltest/source/Makefile.in
branches/3.2-perltest/source/configure.in
Changeset:
Property changes on: branches/3.2-perltest
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/3.2-perltest/source/Makefile.in
===
--- branches/3.2-perltest/source/Makefile.in2007-09-26 19:05:51 UTC (rev
25356)
+++ branches/3.2-perltest/source/Makefile.in2007-09-26 19:19:56 UTC (rev
25357)
@@ -52,6 +52,8 @@
[EMAIL PROTECTED]@
+SELFTEST_ARGS = @SELFTEST_ARGS@
+
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -2097,7 +2099,7 @@
SELFTEST = $(PERL) $(samba4srcdir)/selftest/selftest.pl
--prefix=${selftest_prefix} \
--srcdir=${samba4srcdir} --bindir=${builddir}/bin
--testlist=${srcdir}/script/tests/tests_all.sh| \
- --expected-failures=samba3-knownfail --target=samba3
--skip=samba3-skip
+ --expected-failures=samba3-knownfail --target=samba3
--skip=samba3-skip $(SELFTEST_ARGS)
##
## Targets for 'make test'
##
Modified: branches/3.2-perltest/source/configure.in
===
--- branches/3.2-perltest/source/configure.in 2007-09-26 19:05:51 UTC (rev
25356)
+++ branches/3.2-perltest/source/configure.in 2007-09-26 19:19:56 UTC (rev
25357)
@@ -6416,7 +6416,9 @@
AC_DEFINE(ENABLE_BUILD_FARM_HACKS, 1, [Defined if running in the build
farm])
else
AC_MSG_RESULT(no)
+ SELFTEST_ARGS=$SELFTEST_ARGS --skip=samba3-skip-nobuildfarm
fi
+AC_SUBST(SELFTEST_ARGS)
#
# check for bad librt/libpthread interactions
Added: branches/3.2-perltest/source/samba3-skip-nobuildfarm
===
--- branches/3.2-perltest/source/samba3-skip-nobuildfarm2007-09-26
19:05:51 UTC (rev 25356)
+++ branches/3.2-perltest/source/samba3-skip-nobuildfarm2007-09-26
19:19:56 UTC (rev 25357)
@@ -0,0 +1,3 @@
+RPC-NETLOGSAMBA3 # FIXME: Should only be run on
the build farm
+RPC-SAMBA3SESSIONKEY # FIXME: Should only be run on the
build farm
+RPC-SAMBA3-GETUSERNAME # FIXME: Should only be run on the
build farm
svn commit: samba r25358 - in branches/3.2-perltest: . source
Author: jelmer Date: 2007-09-26 19:22:13 + (Wed, 26 Sep 2007) New Revision: 25358 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25358 Log: Update skips/knownfailures for Samba 3. Modified: branches/3.2-perltest/ branches/3.2-perltest/source/samba3-knownfail branches/3.2-perltest/source/samba3-skip Changeset: Property changes on: branches/3.2-perltest ___ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/3.2-perltest/source/samba3-knownfail === --- branches/3.2-perltest/source/samba3-knownfail 2007-09-26 19:19:56 UTC (rev 25357) +++ branches/3.2-perltest/source/samba3-knownfail 2007-09-26 19:22:13 UTC (rev 25358) @@ -2,7 +2,7 @@ BASE-DELETE-deltest18 BASE-DELETE-deltest19 BASE-DELETE-deltest20 -NBT-REGISTER.*/refresh_own +NBT-REGISTER.*/refresh_own # Bug in Samba3's WINS server RPC-SRVSVC.*/NetShareGetInfo RPC-SRVSVC.*/NetTransportEnum RPC-SRVSVC.*/NetShareEnumAll @@ -18,24 +18,8 @@ blackbox.smbclient/domain join blackbox.smbclient/Test login with --machine-pass without kerberos blackbox.smbclient/Test login with --machine-pass and kerberos -BASE-CHARSET # FIXME: Should be succeeding -BASE-DELAYWRITE# FIXME: Should be succeeding -BASE-TCONDEV # FIXME: Should be succeeding -RPC-SAMBA3-SHARESEC# FIXME: Should be succeeding -RAW-ACLS # FIXME: Should be succeeding -RAW-COMPOSITE # FIXME: Should be succeeding -RAW-SAMBA3POSIXTIMEDLOCK # FIXME: Should be succeeding -RAW-IOCTL # FIXME: Should be succeeding -RAW-CONTEXT# FIXME: Should be succeeding -RAW-EAS# FIXME: Should be succeeding -RAW-SEARCH.*/one file search # FIXME: Should be succeeding -RAW-SEARCH.*/ea list # FIXME: Should be succeeding -RAW-SEARCH.*/many files# FIXME: Should be succeeding -RAW-QFILEINFO # FIXME: Should be succeeding -RAW-QFSINFO# FIXME: Should be succeeding -RAW-SFILEINFO # FIXME: Should be succeeding -RAW-STREAMS# FIXME: Should be succeeding -BASE-RW1 # FIXME: Should be succeeding -RPC-NETLOGSAMBA3 # Should only be run on the build farm -RPC-SAMBA3SESSIONKEY # Should only be run on the build farm -RPC-SAMBA3-GETUSERNAME # Should only be run on the build farm +RAW-SEARCH.*/one file search +RAW-SEARCH.*/ea list +RAW-SEARCH.*/many files +BASE-DELAYWRITE.*/finfo update on close +blackbox.smbclient/List directory with LANMAN. # Samba 3 disables LANMAN authentication by default now Modified: branches/3.2-perltest/source/samba3-skip === --- branches/3.2-perltest/source/samba3-skip2007-09-26 19:19:56 UTC (rev 25357) +++ branches/3.2-perltest/source/samba3-skip2007-09-26 19:22:13 UTC (rev 25358) @@ -18,10 +18,14 @@ RPC-SAMR # Doesn't work against Samba 3 yet and isn't split up into subtests RPC-SECRETS# Doesn't work against Samba 3 yet RPC-SAMSYNC# Doesn't work against Samba 3 yet +RPC-EPMAPPER # No epmapper interface in Samba 3 RPC-LSA# Doesn't work against Samba 3 yet RPC-WKSSVC # Doesn't work against Samba 3 yet RPC-WINREG # Doesn't work against Samba 3 yet RPC-HANDLES# Doesn't work against Samba 3 yet +RPC-ATSVC # No atsvc interface on Samba 3 yet +RPC-OXIDRESOLVE# No oxidresolve on Samba 3 yet +RPC-REMACT # No remact on Samba 3 yet RPC-DFS# Doesn't work against Samba 3 yet RPC-ECHO # Sinkone fails against samba3 for some reason and causes a disconnect ^LOCAL-.* # No point running the LOCAL Samba 4 tests @@ -29,17 +33,12 @@ RPC-COUNTCALLS # Slow, fails RPC-DSSETUP# No DSSETUP interface in Samba 3 BASE-ALIASES -NET-API-LOOKUPPDC -NET-API-RPCCONN-PDC -NET-API-RPCCONN-DC -NET-API-RPCCONN-DCINFO -NET-API-CREATEUSER -NET-API-DELETEUSER RPC-SVCCTL RAW-PING-PONG
svn commit: samba r25359 - in branches/SAMBA_4_0: . source/selftest/env
Author: jelmer
Date: 2007-09-26 19:23:54 + (Wed, 26 Sep 2007)
New Revision: 25359
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25359
Log:
Set up Samba3 as dc.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/env/Samba3.pm
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/selftest/env/Samba3.pm
===
--- branches/SAMBA_4_0/source/selftest/env/Samba3.pm2007-09-26 19:22:13 UTC
(rev 25358)
+++ branches/SAMBA_4_0/source/selftest/env/Samba3.pm2007-09-26 19:23:54 UTC
(rev 25359)
@@ -96,7 +96,7 @@
{
my ($self, $path) = @_;
- my $vars = $self-provision($path);
+ my $vars = $self-provision($path, dc);
$self-check_or_start($vars, ($ENV{NMBD_MAXTIME} or 2700),
($ENV{SMBD_MAXTIME} or 2700));
@@ -205,9 +205,9 @@
close(CONF);
}
-sub provision($$)
+sub provision($$$)
{
- my ($self, $prefix) = @_;
+ my ($self, $prefix, $role) = @_;
##
## setup the various environment variables we need
@@ -274,6 +274,15 @@
printing = bsd
printcap name = /dev/null
+;
+
+ if ($role eq dc) {
+ print CONF \tdomain logons = yes\n;
+ print CONF \tdomain master = yes\n;
+ }
+
+print CONF
+
[tmp]
path = $tmpdir
read only = no
svn commit: samba r25360 - in branches/SAMBA_4_0: . source/selftest
Author: jelmer
Date: 2007-09-26 19:25:50 + (Wed, 26 Sep 2007)
New Revision: 25360
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25360
Log:
Allow --skip to be specified more than once.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/selftest.pl
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/selftest/selftest.pl
===
--- branches/SAMBA_4_0/source/selftest/selftest.pl 2007-09-26 19:23:54 UTC
(rev 25359)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl 2007-09-26 19:25:50 UTC
(rev 25360)
@@ -137,7 +137,7 @@
my $opt_one = 0;
my $opt_immediate = 0;
my $opt_expected_failures = undef;
-my $opt_skip = undef;
+my @opt_skip = ();
my $opt_verbose = 0;
my $opt_testenv = 0;
my $ldap = undef;
@@ -321,7 +321,7 @@
'one' = \$opt_one,
'immediate' = \$opt_immediate,
'expected-failures=s' = \$opt_expected_failures,
- 'skip=s' = \$opt_skip,
+ 'skip=s' = [EMAIL PROTECTED],
'srcdir=s' = \$srcdir,
'builddir=s' = \$builddir,
'verbose' = \$opt_verbose,
@@ -458,8 +458,8 @@
@expected_failures = read_test_regexes($opt_expected_failures);
}
-if (defined($opt_skip)) {
- @skips = read_test_regexes($opt_skip);
+foreach (@opt_skip) {
+ push (@skips, read_test_regexes($_));
}
my $interfaces = join(',', (127.0.0.6/8,
svn commit: samba r25361 - in branches/SAMBA_4_0: . source/selftest source/torture
Author: jelmer
Date: 2007-09-26 19:28:40 + (Wed, 26 Sep 2007)
New Revision: 25361
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25361
Log:
Specify share correctly for RPC-SAMBA3-SHARESEC, allow overriding share from
command-line in smbtorture.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/test_rpc.sh
branches/SAMBA_4_0/source/torture/smbtorture.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/selftest/test_rpc.sh
===
--- branches/SAMBA_4_0/source/selftest/test_rpc.sh 2007-09-26 19:25:50 UTC
(rev 25360)
+++ branches/SAMBA_4_0/source/selftest/test_rpc.sh 2007-09-26 19:28:40 UTC
(rev 25361)
@@ -2,7 +2,7 @@
# add tests to this list as they start passing, so we test
# that they stay passing
-ncacn_np_tests=RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-SAMSYNC RPC-SAMBA3SESSIONKEY
RPC-SAMBA3-SHARESEC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-BINDSAMBA3
RPC-NETLOGSAMBA3 RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2
RPC-AUTHCONTEXT
+ncacn_np_tests=RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-SAMSYNC RPC-SAMBA3SESSIONKEY
RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-BINDSAMBA3 RPC-NETLOGSAMBA3
RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT
ncalrpc_tests=RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-DRSUAPI RPC-ASYNCBIND RPC-LSALOOKUP
RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT
ncacn_ip_tcp_tests=RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-DSSYNC RPC-ASYNCBIND RPC-LSALOOKUP
RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT
slow_ncacn_np_tests=RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS
@@ -12,7 +12,7 @@
incdir=`dirname $0`
. $incdir/test_functions.sh
-all_tests=$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests
$slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS
+all_tests=$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests
$slow_ncalrpc_tests $slow_ncacn_np_tests $slow_ncacn_ip_tcp_tests RPC-SECRETS
RPC-SAMBA3-SHARESEC
# Make sure all tests get run
for t in `$samba4bindir/smbtorture --list | grep ^RPC-`
@@ -34,6 +34,7 @@
name=$t on $transport with $bindoptions
plantest $name dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS
$transport:\$SERVER[$bindoptions] -U\$USERNAME%\$PASSWORD -W \$DOMAIN $t
$*
done
+ plantest RPC-SAMBA3-SHARESEC on $transport with $bindoptions dc $VALGRIND
$samba4bindir/smbtorture $TORTURE_OPTIONS $transport:\$SERVER[$bindoptions]
-U\$USERNAME%\$PASSWORD -W \$DOMAIN --option=torture:share=tmp $t $*
done
done
@@ -56,3 +57,4 @@
done
done
done
+
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===
--- branches/SAMBA_4_0/source/torture/smbtorture.c 2007-09-26 19:25:50 UTC
(rev 25360)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c 2007-09-26 19:28:40 UTC
(rev 25361)
@@ -633,7 +633,8 @@
return false;
}
lp_set_cmdline(torture:host, binding_struct-host);
- lp_set_cmdline(torture:share, IPC$);
+ if (lp_parm_string(NULL, torture, share) == NULL)
+ lp_set_cmdline(torture:share, IPC$);
lp_set_cmdline(torture:binding, argv_new[1]);
} else {
lp_set_cmdline(torture:host, host);
svn commit: samba r25362 - in branches: SAMBA_3_2/source/registry SAMBA_3_2_0/source/registry
Author: gd
Date: 2007-09-26 21:46:43 + (Wed, 26 Sep 2007)
New Revision: 25362
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25362
Log:
Add NT Authority\System with Full Access to the default registry security
descriptor.
Guenther
Modified:
branches/SAMBA_3_2/source/registry/reg_frontend_hilvl.c
branches/SAMBA_3_2_0/source/registry/reg_frontend_hilvl.c
Changeset:
Modified: branches/SAMBA_3_2/source/registry/reg_frontend_hilvl.c
===
--- branches/SAMBA_3_2/source/registry/reg_frontend_hilvl.c 2007-09-26
19:28:40 UTC (rev 25361)
+++ branches/SAMBA_3_2/source/registry/reg_frontend_hilvl.c 2007-09-26
21:46:43 UTC (rev 25362)
@@ -34,7 +34,7 @@
static SEC_DESC* construct_registry_sd( TALLOC_CTX *ctx )
{
- SEC_ACE ace[2];
+ SEC_ACE ace[3];
SEC_ACCESS mask;
size_t i = 0;
SEC_DESC *sd;
@@ -50,8 +50,13 @@
init_sec_access(mask, REG_KEY_ALL );
init_sec_ace(ace[i++], global_sid_Builtin_Administrators,
SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+ /* Full Access 'NT Authority\System' */
+
+ init_sec_access(mask, REG_KEY_ALL );
+ init_sec_ace(ace[i++], global_sid_System,
SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
-
/* create the security descriptor */
if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
Modified: branches/SAMBA_3_2_0/source/registry/reg_frontend_hilvl.c
===
--- branches/SAMBA_3_2_0/source/registry/reg_frontend_hilvl.c 2007-09-26
19:28:40 UTC (rev 25361)
+++ branches/SAMBA_3_2_0/source/registry/reg_frontend_hilvl.c 2007-09-26
21:46:43 UTC (rev 25362)
@@ -34,7 +34,7 @@
static SEC_DESC* construct_registry_sd( TALLOC_CTX *ctx )
{
- SEC_ACE ace[2];
+ SEC_ACE ace[3];
SEC_ACCESS mask;
size_t i = 0;
SEC_DESC *sd;
@@ -50,8 +50,13 @@
init_sec_access(mask, REG_KEY_ALL );
init_sec_ace(ace[i++], global_sid_Builtin_Administrators,
SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
+ /* Full Access 'NT Authority\System' */
+
+ init_sec_access(mask, REG_KEY_ALL );
+ init_sec_ace(ace[i++], global_sid_System,
SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
+
-
/* create the security descriptor */
if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
svn commit: samba r25363 - in branches/SAMBA_4_0: . source/nbt_server
Author: jelmer
Date: 2007-09-26 23:24:47 + (Wed, 26 Sep 2007)
New Revision: 25363
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25363
Log:
Move service code to separate module.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/nbt_server/config.mk
branches/SAMBA_4_0/source/nbt_server/register.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/nbt_server/config.mk
===
--- branches/SAMBA_4_0/source/nbt_server/config.mk 2007-09-26 21:46:43 UTC
(rev 25362)
+++ branches/SAMBA_4_0/source/nbt_server/config.mk 2007-09-26 23:24:47 UTC
(rev 25363)
@@ -54,11 +54,8 @@
###
# Start SUBSYSTEM NBTD
-[MODULE::NBTD]
-INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = service
+[SUBSYSTEM::NBT_SERVER]
OBJ_FILES = \
- nbt_server.o \
interfaces.o \
register.o \
query.o \
@@ -68,6 +65,13 @@
irpc.o
PRIVATE_PROTO_HEADER = nbt_server_proto.h
PRIVATE_DEPENDENCIES = \
- LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model
+ LIBCLI_NBT NBTD_WINS NBTD_DGRAM
# End SUBSYSTEM NBTD
###
+
+[MODULE::service_nbtd]
+INIT_FUNCTION = server_service_nbtd_init
+SUBSYSTEM = service
+OBJ_FILES = \
+ nbt_server.o
+PRIVATE_DEPENDENCIES = NBT_SERVER process_model
Modified: branches/SAMBA_4_0/source/nbt_server/register.c
===
--- branches/SAMBA_4_0/source/nbt_server/register.c 2007-09-26 21:46:43 UTC
(rev 25362)
+++ branches/SAMBA_4_0/source/nbt_server/register.c 2007-09-26 23:24:47 UTC
(rev 25363)
@@ -31,7 +31,6 @@
#include dsdb/samdb/samdb.h
#include param/param.h
-
static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);
/*
@@ -227,9 +226,9 @@
/*
register one name on all our interfaces
*/
-static void nbtd_register_name(struct nbtd_server *nbtsrv,
- const char *name, enum nbt_name_type type,
- uint16_t nb_flags)
+void nbtd_register_name(struct nbtd_server *nbtsrv,
+ const char *name, enum nbt_name_type type,
+ uint16_t nb_flags)
{
struct nbtd_interface *iface;
svn commit: samba r25364 - in branches/SAMBA_4_0: . source/selftest/output
Author: jelmer
Date: 2007-09-26 23:36:07 + (Wed, 26 Sep 2007)
New Revision: 25364
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25364
Log:
List skipped testsuites in summary only.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/selftest/output/html.pm
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/selftest/output/html.pm
===
--- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-09-26 23:24:47 UTC
(rev 25363)
+++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-09-26 23:36:07 UTC
(rev 25364)
@@ -23,6 +23,7 @@
unexpected_success = [],
expected_failure = [],
unexpected_failure = [],
+ skip_testsuites = [],
error = []
}
};
@@ -325,6 +326,27 @@
print_table(Unexpected failures, $summ-{unexpected_failure});
print_table(Skipped tests, $summ-{skip});
print_table(Expected failures, $summ-{expected_failure});
+
+ print SUMMARY h3Skipped testsuites/h3\n;
+ print SUMMARY table\n;
+ print SUMMARY tr\n;
+ print SUMMARY td class=\tableHead\Testsuite/td\n;
+ print SUMMARY td class=\tableHead\Reason/td\n;
+ print SUMMARY /tr\n;
+
+ foreach (@{$summ-{skip_testsuites}}) {
+ print SUMMARY tr\n;
+ print SUMMARY td$$_[1]/td\n;
+ if (defined($$_[2])) {
+ print SUMMARY td$$_[2]/td\n;
+ } else {
+ print SUMMARY td/td\n;
+ }
+ print SUMMARY /tr\n;
+ }
+
+ print SUMMARY /table;
+
$self-print_html_footer(*SUMMARY);
close(SUMMARY);
}
@@ -340,15 +362,8 @@
{
my ($self, $envname, $name, $reason) = @_;
- print INDEX tr\n;
- print INDEX td class=\testSuite\$name/td\n;
- print INDEX td class=\environment\$envname/td\n;
- if ($reason) {
- print INDEX td class=\resultSkipped\SKIPPED -
$reason/td\n;
- } else {
- print INDEX td class=\resultSkipped\SKIPPED/td\n;
- }
- print INDEX /tr\n;
+ push (@{$self-{error_summary}-{skip_testsuites}},
+ [$envname, $name, $reason]);
}
1;
svn commit: samba r25365 - in branches/SAMBA_4_0: . source/selftest
Author: jelmer Date: 2007-09-26 23:44:50 + (Wed, 26 Sep 2007) New Revision: 25365 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25365 Log: Clearer test names Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/selftest/test_pidl.sh branches/SAMBA_4_0/source/selftest/test_simple.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/selftest/test_pidl.sh === --- branches/SAMBA_4_0/source/selftest/test_pidl.sh 2007-09-26 23:36:07 UTC (rev 25364) +++ branches/SAMBA_4_0/source/selftest/test_pidl.sh 2007-09-26 23:44:50 UTC (rev 25365) @@ -11,7 +11,7 @@ echo Skipping pidl tests - PIDL_TESTS_SKIP=yes elif $PERL -e 'eval require Test::More;' /dev/null 21; then for f in $samba4srcdir/pidl/tests/*.pl; do - plantest `basename $f` none $PERL $f | $samba4srcdir/script/harness2subunit.pl + plantest pidl/`basename $f` none $PERL $f | $samba4srcdir/script/harness2subunit.pl done else echo Skipping pidl tests - Test::More not installed Modified: branches/SAMBA_4_0/source/selftest/test_simple.sh === --- branches/SAMBA_4_0/source/selftest/test_simple.sh 2007-09-26 23:36:07 UTC (rev 25364) +++ branches/SAMBA_4_0/source/selftest/test_simple.sh 2007-09-26 23:44:50 UTC (rev 25365) @@ -9,5 +9,5 @@ tests=BASE-RW1 for t in $tests; do -plantest $t dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U\$USERNAME%\$PASSWORD $t +plantest ntvfs/simple $t dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U\$USERNAME%\$PASSWORD $t done
svn commit: samba r25366 - in branches/3.2-perltest: . source source/script/tests
Author: jelmer
Date: 2007-09-27 00:00:38 + (Thu, 27 Sep 2007)
New Revision: 25366
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25366
Log:
Fix the last few 3.2 tests.
Modified:
branches/3.2-perltest/
branches/3.2-perltest/source/samba3-skip
branches/3.2-perltest/source/script/tests/test_functions.sh
branches/3.2-perltest/source/script/tests/test_smbclient_s3.sh
Changeset:
Property changes on: branches/3.2-perltest
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/3.2-perltest/source/samba3-skip
===
--- branches/3.2-perltest/source/samba3-skip2007-09-26 23:44:50 UTC (rev
25365)
+++ branches/3.2-perltest/source/samba3-skip2007-09-27 00:00:38 UTC (rev
25366)
@@ -69,6 +69,9 @@
BASE-CHARSET
BASE-DELAYWRITE
RAW-SAMBA3POSIXTIMEDLOC
-RAW-COMPOSITE
RAW-BENCH-OPLOCK
pidl.*
+tdb stress
+RAW-COMPOSITE.*
+BASE-DEFER_OPEN
+BASE-SCAN-IOCTL
Modified: branches/3.2-perltest/source/script/tests/test_functions.sh
===
--- branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-26
23:44:50 UTC (rev 25365)
+++ branches/3.2-perltest/source/script/tests/test_functions.sh 2007-09-27
00:00:38 UTC (rev 25366)
@@ -9,278 +9,3 @@
echo $cmdline
}
-samba3_stop_sig_term() {
- RET=0
- kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` /dev/null 21 || \
- kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$?
-
- kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` /dev/null 21 || \
- kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$?
-
- return $RET;
-}
-
-samba3_stop_sig_kill() {
- kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` /dev/null 21
- kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` /dev/null 21
- return 0;
-}
-
-samba3_check_or_start() {
- if [ -n $SERVER_TEST_FIFO ];then
-
- trap samba3_stop_sig_kill INT QUIT
- trap samba3_stop_sig_kill TERM
-
- if [ -p $SERVER_TEST_FIFO ];then
- return 0;
- fi
-
- if [ -n $SOCKET_WRAPPER_DIR ];then
- if [ -d $SOCKET_WRAPPER_DIR ]; then
- rm -f $SOCKET_WRAPPER_DIR/*
- else
- mkdir -p $SOCKET_WRAPPER_DIR
- fi
- fi
-
- rm -f $SERVER_TEST_FIFO
- mkfifo $SERVER_TEST_FIFO
-
- rm -f $NMBD_TEST_LOG
- echo -n STARTING NMBD...
- ((
- if test x$NMBD_MAXTIME = x; then
- NMBD_MAXTIME=2700
- fi
- MAKE_TEST_BINARY=$BINDIR/nmbd
- export MAKE_TEST_BINARY
- timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F
-S --no-process-group -d0 -s $SERVERCONFFILE $NMBD_TEST_LOG 21
- TIMELIMIT_NMBD_PID=$!
- MAKE_TEST_BINARY=
- echo $TIMELIMIT_NMBD_PID $PIDDIR/timelimit.nmbd.pid
- wait $TIMELIMIT_NMBD_PID
- ret=$?;
- rm -f $SERVER_TEST_FIFO
- if [ -n $SOCKET_WRAPPER_DIR -a -d
$SOCKET_WRAPPER_DIR ]; then
- rm -f $SOCKET_WRAPPER_DIR/*
- fi
- if [ x$ret = x0 ];then
- echo nmbd exits with status $ret;
- echo nmbd exits with status $ret
$NMBD_TEST_LOG;
- elif [ x$ret = x137 ];then
- echo nmbd got SIGXCPU and exits with status
$ret!
- echo nmbd got SIGXCPU and exits with status
$ret!$NMBD_TEST_LOG;
- else
- echo nmbd failed with status $ret!
- echo nmbd failed with status
$ret!$NMBD_TEST_LOG;
- fi
- exit $ret;
- ) || exit $? ) 2/dev/null || exit $?
- echo DONE
-
- rm -f $SMBD_TEST_LOG
- echo -n STARTING SMBD...
- ((
- if test x$SMBD_MAXTIME = x; then
- SMBD_MAXTIME=2700
- fi
- MAKE_TEST_BINARY=$BINDIR/smbd
- export MAKE_TEST_BINARY
- timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F
-S --no-process-group -d0 -s $SERVERCONFFILE $SMBD_TEST_LOG 21
- TIMELIMIT_SMBD_PID=$!
- MAKE_TEST_BINARY=
- echo $TIMELIMIT_SMBD_PID
Build status as of Thu Sep 27 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-09-26 00:01:31.0 + +++ /home/build/master/cache/broken_results.txt 2007-09-27 00:00:52.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Sep 26 00:00:02 2007 +Build status as of Thu Sep 27 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -16,8 +16,8 @@ rsync32 13 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 29 17 2 -samba_3_232 16 0 +samba4 29 19 2 +samba_3_232 18 0 smb-build30 30 0 talloc 32 1 0 tdb 32 3 0
svn commit: samba r25367 - in branches/SAMBA_4_0/source/libnet: .
Author: mimir
Date: 2007-09-27 00:25:54 + (Thu, 27 Sep 2007)
New Revision: 25367
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25367
Log:
Add initial implementation of internal group add function.
rafal
Added:
branches/SAMBA_4_0/source/libnet/groupman.c
branches/SAMBA_4_0/source/libnet/groupman.h
Modified:
branches/SAMBA_4_0/source/libnet/config.mk
branches/SAMBA_4_0/source/libnet/libnet.h
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/config.mk
===
--- branches/SAMBA_4_0/source/libnet/config.mk 2007-09-27 00:00:38 UTC (rev
25366)
+++ branches/SAMBA_4_0/source/libnet/config.mk 2007-09-27 00:25:54 UTC (rev
25367)
@@ -28,6 +28,7 @@
userinfo.o \
groupinfo.o \
userman.o \
+ groupman.o \
prereq_domain.o
PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA
RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS
LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel
PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5
Added: branches/SAMBA_4_0/source/libnet/groupman.c
===
--- branches/SAMBA_4_0/source/libnet/groupman.c 2007-09-27 00:00:38 UTC (rev
25366)
+++ branches/SAMBA_4_0/source/libnet/groupman.c 2007-09-27 00:25:54 UTC (rev
25367)
@@ -0,0 +1,138 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Copyright (C) Rafal Szczesniak 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 http://www.gnu.org/licenses/.
+*/
+
+/*
+ a composite function for manipulating (add/edit/del) groups via samr pipe
+*/
+
+#include includes.h
+#include libcli/composite/composite.h
+#include libnet/composite.h
+#include libnet/groupman.h
+#include librpc/gen_ndr/ndr_samr_c.h
+
+
+struct groupadd_state {
+ struct dcerpc_pipe *pipe;
+ struct policy_handle domain_handle;
+ struct samr_CreateDomainGroup creategroup;
+ struct policy_handle group_handle;
+ uint32_t group_rid;
+
+ void (*monitor_fn)(struct monitor_msg*);
+};
+
+
+static void continue_groupadd_created(struct rpc_request *req);
+
+
+struct composite_context* libnet_rpc_groupadd_send(struct dcerpc_pipe *p,
+ struct libnet_rpc_groupadd
*io,
+ void (*monitor)(struct
monitor_msg*))
+{
+ struct composite_context *c;
+ struct groupadd_state *s;
+ struct rpc_request *create_req;
+
+ if (!p || !io) return NULL;
+
+ c = composite_create(p, dcerpc_event_context(p));
+ if (c == NULL) return NULL;
+
+ s = talloc_zero(c, struct groupadd_state);
+ if (composite_nomem(s, c)) return c;
+
+ c-private_data = s;
+
+ s-domain_handle = io-in.domain_handle;
+ s-pipe = p;
+ s-monitor_fn= monitor;
+
+ s-creategroup.in.domain_handle = s-domain_handle;
+
+ s-creategroup.in.name = talloc_zero(c, struct lsa_String);
+ if (composite_nomem(s-creategroup.in.name, c)) return c;
+
+ s-creategroup.in.name-string = talloc_strdup(c, io-in.groupname);
+ if (composite_nomem(s-creategroup.in.name-string, c)) return c;
+
+ s-creategroup.in.access_mask= 0;
+
+ s-creategroup.out.group_handle = s-group_handle;
+ s-creategroup.out.rid = s-group_rid;
+
+ create_req = dcerpc_samr_CreateDomainGroup_send(s-pipe, c,
s-creategroup);
+ if (composite_nomem(create_req, c)) return c;
+
+ composite_continue_rpc(c, create_req, continue_groupadd_created, c);
+ return c;
+}
+
+
+NTSTATUS libnet_rpc_groupadd_recv(struct composite_context *c, TALLOC_CTX
*mem_ctx,
+ struct libnet_rpc_groupadd *io)
+{
+ NTSTATUS status;
+ struct groupadd_state *s;
+
+ status = composite_wait(c);
+ if (NT_STATUS_IS_OK(status)) {
+ s = talloc_get_type(c, struct groupadd_state);
+ }
+
+ return status;
+}
+
+
+static void continue_groupadd_created(struct rpc_request *req)
+{
+ struct composite_context *c;
+ struct groupadd_state *s;
+
+ c = talloc_get_type(req-async.private_data, struct composite_context);
+ s =
svn commit: samba r25368 - in branches/SAMBA_4_0/source/torture: . libnet
Author: mimir
Date: 2007-09-27 00:27:26 + (Thu, 27 Sep 2007)
New Revision: 25368
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25368
Log:
Add the test of group add routine.
rafal
Added:
branches/SAMBA_4_0/source/torture/libnet/groupman.c
branches/SAMBA_4_0/source/torture/libnet/grouptest.h
Modified:
branches/SAMBA_4_0/source/torture/config.mk
branches/SAMBA_4_0/source/torture/libnet/libnet.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-09-27 00:25:54 UTC (rev
25367)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-09-27 00:27:26 UTC (rev
25368)
@@ -280,6 +280,7 @@
libnet/userinfo.o \
libnet/userman.o \
libnet/groupinfo.o \
+ libnet/groupman.o \
libnet/domain.o \
libnet/libnet_lookup.o \
libnet/libnet_user.o \
Added: branches/SAMBA_4_0/source/torture/libnet/groupman.c
===
--- branches/SAMBA_4_0/source/torture/libnet/groupman.c 2007-09-27 00:25:54 UTC
(rev 25367)
+++ branches/SAMBA_4_0/source/torture/libnet/groupman.c 2007-09-27 00:27:26 UTC
(rev 25368)
@@ -0,0 +1,197 @@
+/*
+ Unix SMB/CIFS implementation.
+ Test suite for libnet calls.
+
+ Copyright (C) Rafal Szczesniak 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 http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include torture/rpc/rpc.h
+#include torture/libnet/grouptest.h
+#include libnet/libnet.h
+#include librpc/gen_ndr/ndr_samr_c.h
+#include param/param.h
+
+
+static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+ struct policy_handle *handle, struct lsa_String
*domname)
+{
+ NTSTATUS status;
+ struct policy_handle h, domain_handle;
+ struct samr_Connect r1;
+ struct samr_LookupDomain r2;
+ struct samr_OpenDomain r3;
+
+ printf(connecting\n);
+
+ r1.in.system_name = 0;
+ r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r1.out.connect_handle = h;
+
+ status = dcerpc_samr_Connect(p, mem_ctx, r1);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(Connect failed - %s\n, nt_errstr(status));
+ return False;
+ }
+
+ r2.in.connect_handle = h;
+ r2.in.domain_name = domname;
+
+ printf(domain lookup on %s\n, domname-string);
+
+ status = dcerpc_samr_LookupDomain(p, mem_ctx, r2);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(LookupDomain failed - %s\n, nt_errstr(status));
+ return False;
+ }
+
+ r3.in.connect_handle = h;
+ r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+ r3.in.sid = r2.out.sid;
+ r3.out.domain_handle = domain_handle;
+
+ printf(opening domain\n);
+
+ status = dcerpc_samr_OpenDomain(p, mem_ctx, r3);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(OpenDomain failed - %s\n, nt_errstr(status));
+ return False;
+ } else {
+ *handle = domain_handle;
+ }
+
+ return True;
+}
+
+
+static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+struct policy_handle *domain_handle, const char
*groupname)
+{
+ NTSTATUS status;
+ struct samr_LookupNames r1;
+ struct samr_OpenGroup r2;
+ struct samr_DeleteDomainGroup r3;
+ struct lsa_String names[2];
+ uint32_t rid;
+ struct policy_handle group_handle;
+
+ names[0].string = groupname;
+
+ r1.in.domain_handle = domain_handle;
+ r1.in.num_names = 1;
+ r1.in.names = names;
+
+ printf(group account lookup '%s'\n, groupname);
+
+ status = dcerpc_samr_LookupNames(p, mem_ctx, r1);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf(LookupNames failed - %s\n, nt_errstr(status));
+ return False;
+ }
+
+ rid = r1.out.rids.ids[0];
+
+ r2.in.domain_handle = domain_handle;
+ r2.in.access_mask= SEC_FLAG_MAXIMUM_ALLOWED;
+ r2.in.rid= rid;
+ r2.out.group_handle = group_handle;
+
+ printf(opening group account\n);
+
+
svn commit: samba r25369 - in branches/4.0-python: . source source/lib source/lib/ldb source/lib/policy source/selftest/env source/setup
Author: jelmer
Date: 2007-09-27 00:42:15 + (Thu, 27 Sep 2007)
New Revision: 25369
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25369
Log:
Remove own copy of python.
Removed:
branches/4.0-python/source/lib/python/
Modified:
branches/4.0-python/
branches/4.0-python/source/configure.ac
branches/4.0-python/source/lib/ldb/config.mk
branches/4.0-python/source/lib/policy/lex.c
branches/4.0-python/source/selftest/env/Samba4.pm
branches/4.0-python/source/setup/provision
Changeset:
Property changes on: branches/4.0-python
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/configure.ac
===
--- branches/4.0-python/source/configure.ac 2007-09-27 00:27:26 UTC (rev
25368)
+++ branches/4.0-python/source/configure.ac 2007-09-27 00:42:15 UTC (rev
25369)
@@ -61,7 +61,124 @@
dnl m4_include(auth/kerberos/config.m4)
-m4_include(lib/python/config.m4)
+AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+ version to use, for example '2.3'. This string
+ will be appended to the Python interpreter
+ canonical name.])
+
+AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+if test -z $PYTHON; then
+ AC_MSG_ERROR([No python found])
+fi
+
+AC_SUBST(PYTHON)
+
+#
+# Check for a version of Python = 2.1.0
+#
+AC_MSG_CHECKING([for a version of Python = '2.1.0'])
+ac_supports_python_ver=`$PYTHON -c import sys, string; \
+ ver = string.split(sys.version)[[0]]; \
+ print ver = '2.1.0'`
+if test $ac_supports_python_ver != True; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([No recent version of python found])
+else
+ AC_MSG_RESULT([yes])
+fi
+
+#
+# Check if you have distutils, else fail
+#
+AC_MSG_CHECKING([for the distutils Python package])
+ac_distutils_result=`$PYTHON -c import distutils 21`
+if test -z $ac_distutils_result; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([distutils not available])
+fi
+
+#
+# Check for Python include path
+#
+AC_MSG_CHECKING([for Python include path])
+if test -z $PYTHON_CPPFLAGS; then
+ python_path=`$PYTHON -c import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_inc();`
+ if test -n ${python_path}; then
+ python_path=-I$python_path
+ fi
+ PYTHON_CPPFLAGS=$python_path
+fi
+AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+AC_SUBST([PYTHON_CPPFLAGS])
+
+#
+# Check for Python library path
+#
+AC_MSG_CHECKING([for Python library path])
+if test -z $PYTHON_LDFLAGS; then
+ # (makes two attempts to ensure we've got a version number
+ # from the interpreter)
+ py_version=`$PYTHON -c from distutils.sysconfig import *; \
+ from string import join; \
+ print join(get_config_vars('VERSION'))`
+ if test $py_version == [None]; then
+ if test -n $PYTHON_VERSION; then
+ py_version=$PYTHON_VERSION
+ else
+ py_version=`$PYTHON -c import sys; \
+ print sys.version[[:3]]`
+ fi
+ fi
+
+ PYTHON_LDFLAGS=`$PYTHON -c from distutils.sysconfig import *; \
+ from string import join; \
+ print '-L' + get_python_lib(0,1), \
+ '-lpython';`$py_version
+fi
+AC_MSG_RESULT([$PYTHON_LDFLAGS])
+AC_SUBST([PYTHON_LDFLAGS])
+
+#
+# Check for site packages
+#
+AC_MSG_CHECKING([for Python site-packages path])
+if test -z $PYTHON_SITE_PKG; then
+ PYTHON_SITE_PKG=`$PYTHON -c import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_lib(0,0);`
+fi
+AC_MSG_RESULT([$PYTHON_SITE_PKG])
+AC_SUBST([PYTHON_SITE_PKG])
+
+#
+# libraries which must be linked in when embedding
+#
+AC_MSG_CHECKING(python extra libraries)
+if test -z $PYTHON_EXTRA_LIBS; then
+ PYTHON_EXTRA_LIBS=`$PYTHON -c import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LOCALMODLIBS'), conf('LIBS')`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+AC_SUBST(PYTHON_EXTRA_LIBS)
+
+#
+# linking flags needed when embedding
+#
+AC_MSG_CHECKING(python extra linking flags)
+if test -z $PYTHON_EXTRA_LDFLAGS; then
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LINKFORSHARED')`
+fi
+AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
+SMB_ENABLE(LIBPYTHON)
+
m4_include(auth/gensec/config.m4)
m4_include(smbd/process_model.m4)
m4_include(ntvfs/posix/config.m4)
Modified:
svn commit: samba r25370 - in branches: SAMBA_3_2/source/registry SAMBA_3_2_0/source/registry
Author: gd
Date: 2007-09-27 01:26:19 + (Thu, 27 Sep 2007)
New Revision: 25370
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25370
Log:
Allow to delete registry keys recursively without deleting the final key.
Guenther
Modified:
branches/SAMBA_3_2/source/registry/reg_api.c
branches/SAMBA_3_2_0/source/registry/reg_api.c
Changeset:
Modified: branches/SAMBA_3_2/source/registry/reg_api.c
===
--- branches/SAMBA_3_2/source/registry/reg_api.c2007-09-27 00:42:15 UTC
(rev 25369)
+++ branches/SAMBA_3_2/source/registry/reg_api.c2007-09-27 01:26:19 UTC
(rev 25370)
@@ -701,15 +701,15 @@
return WERR_OK;
}
-
/*
* Utility function to delete a registry key with all its subkeys.
* Note that reg_deletekey returns ACCESS_DENIED when called on a
* key that has subkeys.
*/
-WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
- struct registry_key *parent,
- const char *path)
+WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path,
+ BOOL del_key)
{
TALLOC_CTX *mem_ctx = NULL;
WERROR werr = WERR_OK;
@@ -731,21 +731,42 @@
while (W_ERROR_IS_OK(werr = reg_enumkey(mem_ctx, key, 0,
subkey_name, NULL)))
{
- werr = reg_deletekey_recursive(mem_ctx, key, subkey_name);
+ werr = reg_deletekey_recursive_internal(mem_ctx, key,
+ subkey_name,
+ True);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
}
if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
- DEBUG(1, (reg_deletekey_recursive: Error enumerating
- subkeys: %s\n, dos_errstr(werr)));
+ DEBUG(1, (reg_deletekey_recursive_internal:
+ Error enumerating subkeys: %s\n,
+ dos_errstr(werr)));
goto done;
}
- /* now delete the actual key */
- werr = reg_deletekey(parent, path);
-
+ werr = WERR_OK;
+
+ if (del_key) {
+ /* now delete the actual key */
+ werr = reg_deletekey(parent, path);
+ }
+
done:
TALLOC_FREE(mem_ctx);
return werr;
}
+
+WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path)
+{
+ return reg_deletekey_recursive_internal(ctx, parent, path, True);
+}
+
+WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path)
+{
+ return reg_deletekey_recursive_internal(ctx, parent, path, False);
+}
Modified: branches/SAMBA_3_2_0/source/registry/reg_api.c
===
--- branches/SAMBA_3_2_0/source/registry/reg_api.c 2007-09-27 00:42:15 UTC
(rev 25369)
+++ branches/SAMBA_3_2_0/source/registry/reg_api.c 2007-09-27 01:26:19 UTC
(rev 25370)
@@ -701,15 +701,15 @@
return WERR_OK;
}
-
/*
* Utility function to delete a registry key with all its subkeys.
* Note that reg_deletekey returns ACCESS_DENIED when called on a
* key that has subkeys.
*/
-WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
- struct registry_key *parent,
- const char *path)
+WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
+ struct registry_key *parent,
+ const char *path,
+ BOOL del_key)
{
TALLOC_CTX *mem_ctx = NULL;
WERROR werr = WERR_OK;
@@ -731,21 +731,42 @@
while (W_ERROR_IS_OK(werr = reg_enumkey(mem_ctx, key, 0,
subkey_name, NULL)))
{
- werr = reg_deletekey_recursive(mem_ctx, key, subkey_name);
+ werr = reg_deletekey_recursive_internal(mem_ctx, key,
+ subkey_name,
+ True);
if (!W_ERROR_IS_OK(werr)) {
goto done;
}
}
if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
- DEBUG(1, (reg_deletekey_recursive: Error enumerating
- subkeys: %s\n, dos_errstr(werr)));
+ DEBUG(1, (reg_deletekey_recursive_internal:
+ Error enumerating subkeys: %s\n,
+
svn commit: samba r25371 - in branches/4.0-python: . source/lib source/scripting/python source/setup
Author: jelmer
Date: 2007-09-27 01:31:43 + (Thu, 27 Sep 2007)
New Revision: 25371
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25371
Log:
Add uuid module.
Added:
branches/4.0-python/source/scripting/python/uuidmodule.c
Modified:
branches/4.0-python/
branches/4.0-python/.bzrignore
branches/4.0-python/source/lib/basic.mk
branches/4.0-python/source/scripting/python/config.mk
branches/4.0-python/source/scripting/python/provision.py
branches/4.0-python/source/scripting/python/talloc.c
branches/4.0-python/source/setup/provision
Changeset:
Property changes on: branches/4.0-python
___
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/.bzrignore
===
--- branches/4.0-python/.bzrignore 2007-09-27 01:26:19 UTC (rev 25370)
+++ branches/4.0-python/.bzrignore 2007-09-27 01:31:43 UTC (rev 25371)
@@ -211,3 +211,4 @@
source/lib/ldb/swig/ldb.py
source/lib/tdb/swig/tdb.py
source/lib/tdb/swig/tdb_wrap.c
+source/scripting/python/talloc.h
Modified: branches/4.0-python/source/lib/basic.mk
===
--- branches/4.0-python/source/lib/basic.mk 2007-09-27 01:26:19 UTC (rev
25370)
+++ branches/4.0-python/source/lib/basic.mk 2007-09-27 01:31:43 UTC (rev
25371)
@@ -15,7 +15,6 @@
include util/config.mk
include tdr/config.mk
include dbwrap/config.mk
-include python/config.mk
##
# Start SUBSYSTEM LIBCRYPTO
Modified: branches/4.0-python/source/scripting/python/config.mk
===
--- branches/4.0-python/source/scripting/python/config.mk 2007-09-27
01:26:19 UTC (rev 25370)
+++ branches/4.0-python/source/scripting/python/config.mk 2007-09-27
01:31:43 UTC (rev 25371)
@@ -7,3 +7,8 @@
PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG talloc_python
OBJ_FILES = \
parammodule.o
+
+[PYTHON::python_uuid]
+PRIVATE_DEPENDENCIES = LIBNDR talloc_python
+OBJ_FILES = \
+ uuidmodule.o
Modified: branches/4.0-python/source/scripting/python/provision.py
===
--- branches/4.0-python/source/scripting/python/provision.py2007-09-27
01:26:19 UTC (rev 25370)
+++ branches/4.0-python/source/scripting/python/provision.py2007-09-27
01:31:43 UTC (rev 25371)
@@ -233,6 +233,7 @@
return False
return True
+
def setup_ldb(ldif, info, dbname, erase=True, failok=False):
ldb = open_ldb(info, dbname, erase)
if setup_add_ldif(ldif, info, ldb, failok):
Modified: branches/4.0-python/source/scripting/python/talloc.c
===
--- branches/4.0-python/source/scripting/python/talloc.c2007-09-27
01:26:19 UTC (rev 25370)
+++ branches/4.0-python/source/scripting/python/talloc.c2007-09-27
01:31:43 UTC (rev 25371)
@@ -25,6 +25,7 @@
#include Python.h
#include param/param.h
-TALLOC_CTX *PyMemCtx() {
+TALLOC_CTX *PyMemCtx(void)
+{
return talloc_autofree_context();
}
Added: branches/4.0-python/source/scripting/python/uuidmodule.c
===
--- branches/4.0-python/source/scripting/python/uuidmodule.c2007-09-27
01:26:19 UTC (rev 25370)
+++ branches/4.0-python/source/scripting/python/uuidmodule.c2007-09-27
01:31:43 UTC (rev 25371)
@@ -0,0 +1,58 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ 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 http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include scripting/python/talloc.h
+#include Python.h
+#include librpc/ndr/libndr.h
+
+static PyObject *uuid_random(PyObject *self, PyObject *args)
+{
+ struct GUID guid;
+ char *str;
+
+ if (!PyArg_ParseTuple(args, ))
+ return NULL;
+
+ guid = GUID_random();
+
+ str = GUID_string(PyMemCtx(), guid);
+ if (str == NULL) {
+ PyErr_SetString(PyExc_TypeError, can't convert uuid to
string);
+ return NULL;
+ }
+
+
svn commit: samba r25372 - in branches/3.2-perltest: . source
Author: jelmer Date: 2007-09-27 01:32:55 + (Thu, 27 Sep 2007) New Revision: 25372 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25372 Log: Ignore local tests that require test data. Modified: branches/3.2-perltest/ branches/3.2-perltest/source/samba3-skip Changeset: Property changes on: branches/3.2-perltest ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/3.2-perltest/source/samba3-skip === --- branches/3.2-perltest/source/samba3-skip2007-09-27 01:31:43 UTC (rev 25371) +++ branches/3.2-perltest/source/samba3-skip2007-09-27 01:32:55 UTC (rev 25372) @@ -75,3 +75,5 @@ RAW-COMPOSITE.* BASE-DEFER_OPEN BASE-SCAN-IOCTL +^ldb$ +^samba3sam.js$
svn commit: samba r25373 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: sahlberg Date: 2007-09-27 03:17:24 + (Thu, 27 Sep 2007) New Revision: 25373 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25373 Log: add three more authentication types Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl === --- branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2007-09-27 01:32:55 UTC (rev 25372) +++ branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2007-09-27 03:17:24 UTC (rev 25373) @@ -124,6 +124,9 @@ const uint8 DCERPC_AUTH_TYPE_SPNEGO = 9; const uint8 DCERPC_AUTH_TYPE_NTLMSSP = 10; const uint8 DCERPC_AUTH_TYPE_KRB5 = 16; + const uint8 DCERPC_AUTH_TYPE_DPA = 17; + const uint8 DCERPC_AUTH_TYPE_MSN = 18; + const uint8 DCERPC_AUTH_TYPE_DIGEST = 21; const uint8 DCERPC_AUTH_TYPE_SCHANNEL = 68; const uint8 DCERPC_AUTH_TYPE_MSMQ = 100;
svn commit: samba r25374 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: sahlberg
Date: 2007-09-27 03:40:04 + (Thu, 27 Sep 2007)
New Revision: 25374
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25374
Log:
create an enum for the authentication types instead of defining them as
constants
Modified:
branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2007-09-27 03:17:24 UTC
(rev 25373)
+++ branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2007-09-27 03:40:04 UTC
(rev 25374)
@@ -118,17 +118,19 @@
} dcerpc_fault;
/* the auth types we know about */
- const uint8 DCERPC_AUTH_TYPE_NONE = 0;
- /* this seems to be not krb5! */
- const uint8 DCERPC_AUTH_TYPE_KRB5_1 = 1;
- const uint8 DCERPC_AUTH_TYPE_SPNEGO = 9;
- const uint8 DCERPC_AUTH_TYPE_NTLMSSP = 10;
- const uint8 DCERPC_AUTH_TYPE_KRB5 = 16;
- const uint8 DCERPC_AUTH_TYPE_DPA = 17;
- const uint8 DCERPC_AUTH_TYPE_MSN = 18;
- const uint8 DCERPC_AUTH_TYPE_DIGEST = 21;
- const uint8 DCERPC_AUTH_TYPE_SCHANNEL = 68;
- const uint8 DCERPC_AUTH_TYPE_MSMQ = 100;
+ typedef [v1_enum] enum {
+ DCERPC_AUTH_TYPE_NONE = 0,
+ /* this seems to be not krb5! */
+ DCERPC_AUTH_TYPE_KRB5_1 = 1,
+ DCERPC_AUTH_TYPE_SPNEGO = 9,
+ DCERPC_AUTH_TYPE_NTLMSSP = 10,
+ DCERPC_AUTH_TYPE_KRB5 = 16,
+ DCERPC_AUTH_TYPE_DPA = 17,
+ DCERPC_AUTH_TYPE_MSN = 18,
+ DCERPC_AUTH_TYPE_DIGEST = 21,
+ DCERPC_AUTH_TYPE_SCHANNEL = 68,
+ DCERPC_AUTH_TYPE_MSMQ = 100
+ } dcerpc_AuthType;
const uint8 DCERPC_AUTH_LEVEL_DEFAULT = DCERPC_AUTH_LEVEL_CONNECT;
const uint8 DCERPC_AUTH_LEVEL_NONE = 1;
