svn commit: samba r18138 - in branches/SAMBA_4_0/source/lib: replace util
Author: metze Date: 2006-09-06 06:05:58 + (Wed, 06 Sep 2006) New Revision: 18138 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18138 Log: LIBREPLACE provides stuff from -ldl so it should depend on it metze Modified: branches/SAMBA_4_0/source/lib/replace/config.mk branches/SAMBA_4_0/source/lib/util/config.mk Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/config.mk === --- branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 05:59:10 UTC (rev 18137) +++ branches/SAMBA_4_0/source/lib/replace/config.mk 2006-09-06 06:05:58 UTC (rev 18138) @@ -14,6 +14,6 @@ snprintf.o \ dlfcn.o \ getpass.o -PUBLIC_DEPENDENCIES = REPLACE_READDIR +PUBLIC_DEPENDENCIES = REPLACE_READDIR DL # End SUBSYSTEM LIBREPLACE ## Modified: branches/SAMBA_4_0/source/lib/util/config.mk === --- branches/SAMBA_4_0/source/lib/util/config.mk2006-09-06 05:59:10 UTC (rev 18137) +++ branches/SAMBA_4_0/source/lib/util/config.mk2006-09-06 06:05:58 UTC (rev 18138) @@ -29,7 +29,7 @@ module.o PUBLIC_DEPENDENCIES = \ LIBREPLACE LIBCRYPTO LIBTALLOC \ - SOCKET_WRAPPER EXT_NSL DL + SOCKET_WRAPPER EXT_NSL [SUBSYSTEM::PIDFILE] PRIVATE_PROTO_HEADER = pidfile.h
svn commit: samba r18139 - in branches/SAMBA_4_0/source/lib/replace: .
Author: tridge
Date: 2006-09-06 06:12:36 + (Wed, 06 Sep 2006)
New Revision: 18139
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18139
Log:
irix needs system/network.h here
Modified:
branches/SAMBA_4_0/source/lib/replace/replace.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 06:05:58 UTC
(rev 18138)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 06:12:36 UTC
(rev 18139)
@@ -28,6 +28,7 @@
#include system/time.h
#include system/passwd.h
#include system/syslog.h
+#include system/network.h
void replace_dummy(void);
void replace_dummy(void) {}
svn commit: samba r18140 - in branches/SAMBA_4_0/source/lib/replace: .
Author: tridge
Date: 2006-09-06 06:14:40 + (Wed, 06 Sep 2006)
New Revision: 18140
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18140
Log:
and this reduces warnings about toupper()
Modified:
branches/SAMBA_4_0/source/lib/replace/replace.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 06:12:36 UTC
(rev 18139)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 06:14:40 UTC
(rev 18140)
@@ -29,6 +29,7 @@
#include system/passwd.h
#include system/syslog.h
#include system/network.h
+#include system/locale.h
void replace_dummy(void);
void replace_dummy(void) {}
svn commit: samba r18141 - in branches/SAMBA_4_0/source/lib/replace/test: .
Author: tridge Date: 2006-09-06 06:20:29 + (Wed, 06 Sep 2006) New Revision: 18141 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18141 Log: an accidental nested C comment! Modified: branches/SAMBA_4_0/source/lib/replace/test/testsuite.c Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/test/testsuite.c === --- branches/SAMBA_4_0/source/lib/replace/test/testsuite.c 2006-09-06 06:14:40 UTC (rev 18140) +++ branches/SAMBA_4_0/source/lib/replace/test/testsuite.c 2006-09-06 06:20:29 UTC (rev 18141) @@ -27,7 +27,7 @@ #include replace.h /* - we include all the system/*.h include files here so that libreplace tests + we include all the system/ include files here so that libreplace tests them in the build farm */ #include system/capability.h
svn commit: samba r18142 - in branches/SAMBA_4_0/source/lib/talloc: .
Author: metze Date: 2006-09-06 06:47:10 + (Wed, 06 Sep 2006) New Revision: 18142 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18142 Log: add make distclean to talloc build metze Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in === --- branches/SAMBA_4_0/source/lib/talloc/Makefile.in2006-09-06 06:20:29 UTC (rev 18141) +++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in2006-09-06 06:47:10 UTC (rev 18142) @@ -46,7 +46,7 @@ -test -z $(XSLTPROC) || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $ clean: - rm -f *~ $(LIBOBJ) libtalloc.a testsuite *.gc?? talloc.3 talloc.3.html + rm -f *~ $(LIBOBJ) libtalloc.a testsuite testsuite.o *.gc?? talloc.3 talloc.3.html test: testsuite ./testsuite @@ -59,7 +59,10 @@ distclean: clean rm -f *~ */*~ - rm -rf autom4te.cache - rm -f configure \ - config.log config.status config.h rm -f Makefile + rm -f config.log \ + config.status \ + config.h + +realdistclean: distclean + rm -f configure config.h.in
svn commit: samba r18143 - in branches/SAMBA_4_0/source/lib: ldb replace talloc tdb
Author: tridge Date: 2006-09-06 07:11:09 + (Wed, 06 Sep 2006) New Revision: 18143 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18143 Log: the 'showflags' convention from Samba is useful for the other packages Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/replace/Makefile.in branches/SAMBA_4_0/source/lib/talloc/Makefile.in branches/SAMBA_4_0/source/lib/tdb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 06:47:10 UTC (rev 18142) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 07:11:09 UTC (rev 18143) @@ -53,8 +53,13 @@ DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples tdb talloc -all: dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages +all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages +showflags: + @echo 'ldb will be compiled with flags:' + @echo ' CFLAGS = $(CFLAGS)' + @echo ' LIBS = $(LIBS)' + .c.o: @echo Compiling $*.c @mkdir -p `dirname [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in === --- branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 06:47:10 UTC (rev 18142) +++ branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 07:11:09 UTC (rev 18143) @@ -17,8 +17,13 @@ OBJS = @LIBREPLACEOBJ@ -all: libreplace.a testsuite +all: showflags libreplace.a testsuite +showflags: + @echo 'libreplace will be compiled with flags:' + @echo ' CFLAGS = $(CFLAGS)' + @echo ' LIBS = $(LIBS)' + install: all mkdir -p $(libdir) $(INSTALL) libreplace.a $(libdir) Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in === --- branches/SAMBA_4_0/source/lib/talloc/Makefile.in2006-09-06 06:47:10 UTC (rev 18142) +++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in2006-09-06 07:11:09 UTC (rev 18143) @@ -19,8 +19,13 @@ LIBOBJ = @TALLOCOBJ@ @LIBREPLACEOBJ@ -all: libtalloc.a testsuite $(EXTRA_TARGETS) +all: showflags libtalloc.a testsuite $(EXTRA_TARGETS) +showflags: + @echo 'talloc will be compiled with flags:' + @echo ' CFLAGS = $(CFLAGS)' + @echo ' LIBS = $(LIBS)' + testsuite: $(LIBOBJ) testsuite.o $(CC) $(CFLAGS) -o testsuite testsuite.o $(LIBOBJ) $(LIBS) Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in === --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 06:47:10 UTC (rev 18142) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 07:11:09 UTC (rev 18143) @@ -19,8 +19,13 @@ DIRS = lib bin common tools examples -all: dirs $(PROGS) +all: showflags dirs $(PROGS) +showflags: + @echo 'tdb will be compiled with flags:' + @echo ' CFLAGS = $(CFLAGS)' + @echo ' LIBS = $(LIBS)' + .c.o: @echo Compiling $*.c @mkdir -p `dirname [EMAIL PROTECTED]
svn commit: samba r18144 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2006-09-06 08:27:07 + (Wed, 06 Sep 2006)
New Revision: 18144
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18144
Log:
make the logic a bit more cutpaste friendly
metze
Modified:
branches/SAMBA_4_0/source/lib/replace/cc_features.m4
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/cc_features.m4
===
--- branches/SAMBA_4_0/source/lib/replace/cc_features.m42006-09-06
07:11:09 UTC (rev 18143)
+++ branches/SAMBA_4_0/source/lib/replace/cc_features.m42006-09-06
08:27:07 UTC (rev 18144)
@@ -8,26 +8,30 @@
# Check if the compiler handles c99 struct initialization, and if not try
-AC99 and -c99 flags
-# Usage: LIBREPLACE_CC_SUPPORTS_C99_STRUCT_INIT(success-action,failure-action)
+# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
# changes CFLAGS to add -AC99 or -c99 if needed
AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
[
-AC_MSG_CHECKING(for C99 designated initializers)
saved_CFLAGS=$CFLAGS;
-AC_TRY_COMPILE([#include stdio.h],
-[ struct foo {int x;char y;};
- struct foo bar = { .y = 'X', .x = 1 };
-],
-[AC_MSG_RESULT(yes); c99_init=yes; $1], [c99_init=no; AC_MSG_RESULT(no)])
+c99_init=no
if test x$c99_init = xno; then
+AC_MSG_CHECKING(for C99 designated initializers)
+CFLAGS=$saved_CFLAGS;
+AC_TRY_COMPILE([#include stdio.h],
+ [ struct foo {int x;char y;};
+ struct foo bar = { .y = 'X', .x = 1 };
+ ],
+ [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
+if test x$c99_init = xno; then
AC_MSG_CHECKING(for C99 designated initializers with -AC99)
CFLAGS=$saved_CFLAGS -AC99;
AC_TRY_COMPILE([#include stdio.h],
[ struct foo {int x;char y;};
struct foo bar = { .y = 'X', .x = 1 };
],
- [AC_MSG_RESULT(yes); c99_init=yes; $1],[AC_MSG_RESULT(no)])
+ [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
fi
if test x$c99_init = xno; then
AC_MSG_CHECKING(for C99 designated initializers with -c99)
@@ -36,7 +40,14 @@
[ struct foo {int x;char y;};
struct foo bar = { .y = 'X', .x = 1 };
],
- [AC_MSG_RESULT(yes); $1],[AC_MSG_RESULT(no);CFLAGS=$saved_CFLAGS; $2])
+ [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
fi
+if test x$c99_init = xyes; then
+saved_CFLAGS=
+$1
+else
+CFLAGS=$saved_CFLAGS
+saved_CFLAGS=
+$2
+fi
])
-
svn commit: samba r18145 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2006-09-06 08:30:56 + (Wed, 06 Sep 2006)
New Revision: 18145
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18145
Log:
rename cc_feature.m4 into libreplace_macros.m4
metze
Added:
branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4
Removed:
branches/SAMBA_4_0/source/lib/replace/cc_features.m4
Modified:
branches/SAMBA_4_0/source/lib/replace/libreplace.m4
Changeset:
Deleted: branches/SAMBA_4_0/source/lib/replace/cc_features.m4
===
--- branches/SAMBA_4_0/source/lib/replace/cc_features.m42006-09-06
08:27:07 UTC (rev 18144)
+++ branches/SAMBA_4_0/source/lib/replace/cc_features.m42006-09-06
08:30:56 UTC (rev 18145)
@@ -1,53 +0,0 @@
-dnl C99 compiler check
-dnl ---
-dnl Copyright (C) Stefan (metze) Metzmacher 2004,2005
-dnl Released under the GNU GPL
-dnl ---
-dnl
-dnl adapted for libreplace by Andrew Tridgell
-
-
-# Check if the compiler handles c99 struct initialization, and if not try
-AC99 and -c99 flags
-# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
-# changes CFLAGS to add -AC99 or -c99 if needed
-
-AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
-[
-saved_CFLAGS=$CFLAGS;
-c99_init=no
-if test x$c99_init = xno; then
-AC_MSG_CHECKING(for C99 designated initializers)
-CFLAGS=$saved_CFLAGS;
-AC_TRY_COMPILE([#include stdio.h],
- [ struct foo {int x;char y;};
- struct foo bar = { .y = 'X', .x = 1 };
- ],
- [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x$c99_init = xno; then
-AC_MSG_CHECKING(for C99 designated initializers with -AC99)
-CFLAGS=$saved_CFLAGS -AC99;
-AC_TRY_COMPILE([#include stdio.h],
- [ struct foo {int x;char y;};
- struct foo bar = { .y = 'X', .x = 1 };
- ],
- [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x$c99_init = xno; then
-AC_MSG_CHECKING(for C99 designated initializers with -c99)
-CFLAGS=$saved_CFLAGS -c99
-AC_TRY_COMPILE([#include stdio.h],
- [ struct foo {int x;char y;};
- struct foo bar = { .y = 'X', .x = 1 };
- ],
- [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
-fi
-if test x$c99_init = xyes; then
-saved_CFLAGS=
-$1
-else
-CFLAGS=$saved_CFLAGS
-saved_CFLAGS=
-$2
-fi
-])
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-06 08:27:07 UTC
(rev 18144)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-06 08:30:56 UTC
(rev 18145)
@@ -167,7 +167,7 @@
[AC_MSG_ERROR([Required function not found])])
m4_include(getpass.m4)
-m4_include(cc_features.m4)
+m4_include(libreplace_macros.m4)
m4_include(system/config.m4)
LIBREPLACE_C99_STRUCT_INIT(c99_struct_initialization=yes,
Copied: branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 (from rev
18144, branches/SAMBA_4_0/source/lib/replace/cc_features.m4)
svn commit: samba r18146 - in branches/SAMBA_4_0/source/lib/replace/system: .
Author: tridge Date: 2006-09-06 08:43:33 + (Wed, 06 Sep 2006) New Revision: 18146 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18146 Log: we need signal.h in some places Modified: branches/SAMBA_4_0/source/lib/replace/system/wait.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/system/wait.h === --- branches/SAMBA_4_0/source/lib/replace/system/wait.h 2006-09-06 08:30:56 UTC (rev 18145) +++ branches/SAMBA_4_0/source/lib/replace/system/wait.h 2006-09-06 08:43:33 UTC (rev 18146) @@ -26,6 +26,8 @@ #include sys/wait.h #endif +#include signal.h + #ifndef SIGCLD #define SIGCLD SIGCHLD #endif
svn commit: samba r18147 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2006-09-06 08:47:32 + (Wed, 06 Sep 2006) New Revision: 18147 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18147 Log: add make realdistclean metze Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in === --- branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 08:43:33 UTC (rev 18146) +++ branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 08:47:32 UTC (rev 18147) @@ -52,8 +52,8 @@ distclean: clean rm -f *~ */*~ - rm -rf autom4te.cache - rm -f configure \ - config.log config.status \ - replace_config.h + rm -f config.log config.status config.h rm -f Makefile + +realdistclean: distclean + rm -f configure config.h.in
svn commit: samba r18148 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: metze Date: 2006-09-06 09:06:49 + (Wed, 06 Sep 2006) New Revision: 18148 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18148 Log: - use PHONY for test - don't try to install with make test - add make distclean and realdistclean metze Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in === --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 08:47:32 UTC (rev 18147) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 09:06:49 UTC (rev 18148) @@ -14,6 +14,8 @@ builddir = @builddir@ CFLAGS = -I$(srcdir)/include -Iinclude [EMAIL PROTECTED]@ @CFLAGS@ +.PHONY: test + PROGS = bin/tdbtool bin/tdbtorture TDB_OBJ = @TDBOBJ@ @LIBREPLACEOBJ@ @@ -61,10 +63,18 @@ bin/tdbbackup: tools/tdbbackup.o libtdb.a $(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb +test: bin/tdbtorture + bin/tdbtorture + +installcheck: test install + clean: - rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm + rm -f $(PROGS) common/*.o tools/*.o test.db test.tdb test.gdbm -installcheck: install - $(bindir)/tdbtorture +distclean: clean + rm -f *~ */*~ + rm -f config.log config.status config.h + rm -f Makefile -test: installcheck +realdistclean: distclean + rm -f configure config.h.in
svn commit: samba r18149 - in branches/SAMBA_4_0/source/lib/tdb: .
Author: metze Date: 2006-09-06 09:26:47 + (Wed, 06 Sep 2006) New Revision: 18149 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18149 Log: fix make *clean metze Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in === --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 09:06:49 UTC (rev 18148) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-06 09:26:47 UTC (rev 18149) @@ -19,7 +19,7 @@ PROGS = bin/tdbtool bin/tdbtorture TDB_OBJ = @TDBOBJ@ @LIBREPLACEOBJ@ -DIRS = lib bin common tools examples +DIRS = bin common tools all: showflags dirs $(PROGS) @@ -69,12 +69,13 @@ installcheck: test install clean: - rm -f $(PROGS) common/*.o tools/*.o test.db test.tdb test.gdbm + rm -f $(PROGS) *.o *.a common/*.o tools/*.o tdb.pc + rm -f test.db test.tdb torture.tdb test.gdbm distclean: clean rm -f *~ */*~ - rm -f config.log config.status config.h + rm -f config.log config.status include/config.h rm -f Makefile realdistclean: distclean - rm -f configure config.h.in + rm -f configure include/config.h.in
svn commit: samba r18150 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: metze
Date: 2006-09-06 09:44:12 + (Wed, 06 Sep 2006)
New Revision: 18150
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18150
Log:
fix make *clean
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/Makefile.in
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 09:26:47 UTC
(rev 18149)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 09:44:12 UTC
(rev 18150)
@@ -51,7 +51,7 @@
EXAMPLES = examples/ldbreader examples/ldifreader
-DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples tdb
talloc
+DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
all: showflags dirs $(OBJS) $(LDB_LIB) $(BINS) $(EXAMPLES) manpages
@@ -111,21 +111,23 @@
test -z $(DOXYGEN) || (cd $(srcdir) $(DOXYGEN))
clean:
- rm -f */*.o *.gcov */*.gc?? tdbtest.ldb* \
+ rm -f *.o */*.o *.gcov */*.gc?? tdbtest.ldb*
rm -f $(BINS) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LIB)
rm -f man/*.1 man/*.3 man/*.html
rm -f $(EXAMPLES)
rm -rf apidocs/
+ rm -rf tests/schema/
distclean: clean
rm -f *~ */*~
- rm -rf autom4te.cache bin lib
- rm -f configure \
- config.log config.status \
- include/config.h include/config.h.in \
+ rm -rf bin lib
+ rm -f config.log config.status include/config.h
rm -f ldb.pc
rm -f Makefile
+realdistclean: distclean
+ rm -f configure.in include/config.h.in
+
test: all
for t in $(TESTS); do echo STARTING $${t}; $(srcdir)/tests/$${t} ||
exit 1; done
@@ -152,7 +154,3 @@
ctags:
ctags `find $(srcdir) -name *.[ch]`
-
[EMAIL PROTECTED]@:
- cd @REPLACE_DIR@ ./autogen.sh ./configure
- $(MAKE) -C @REPLACE_DIR@
svn commit: samba r18151 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2006-09-06 09:47:02 + (Wed, 06 Sep 2006) New Revision: 18151 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18151 Log: remove testfile metze Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in === --- branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 09:44:12 UTC (rev 18150) +++ branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 09:47:02 UTC (rev 18151) @@ -49,6 +49,7 @@ clean: rm -f *.o test/*.o *.a testsuite + rm -f testfile.dat distclean: clean rm -f *~ */*~
svn commit: samba r18154 - in branches/SAMBA_4_0/source: . heimdal_build
Author: tridge Date: 2006-09-06 10:30:17 + (Wed, 06 Sep 2006) New Revision: 18154 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18154 Log: try to get the heimdal_build code to use libreplace in a better way (chasing down build failures ...) added showflags as part of 'all' target, which makes tracking down problems easier in the build farm Modified: branches/SAMBA_4_0/source/heimdal_build/config.h branches/SAMBA_4_0/source/main.mk Changeset: Modified: branches/SAMBA_4_0/source/heimdal_build/config.h === --- branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-06 10:14:01 UTC (rev 18153) +++ branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-06 10:30:17 UTC (rev 18154) @@ -6,11 +6,9 @@ #ifndef HAVE_HEIMDAL_CONFIG_H #define HAVE_HEIMDAL_CONFIG_H 1 -/* bring in the samba4 config.h */ #include include/config.h +#include replace.h -#ifdef HAVE_KRB5 - #define RCSID(msg) #ifdef VOID_RETSIGTYPE @@ -41,14 +39,6 @@ /* these should be done with configure tests */ #define KRB5 -#include sys/types.h -#include stdarg.h -#ifdef HAVE_INTTYPES_H -#include inttypes.h -#endif -#include lib/replace/replace.h -#endif - /* we need to tell roken about the functions that Samba replaces in lib/replace */ #ifndef HAVE_SETEUID #define HAVE_SETEUID 1 Modified: branches/SAMBA_4_0/source/main.mk === --- branches/SAMBA_4_0/source/main.mk 2006-09-06 10:14:01 UTC (rev 18153) +++ branches/SAMBA_4_0/source/main.mk 2006-09-06 10:30:17 UTC (rev 18154) @@ -1,4 +1,4 @@ -all: $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules +all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries libraries modules include dynconfig.mk include heimdal_build/config.mk
svn commit: samba r18155 - in branches/SAMBA_4_0/source/auth: . gensec
Author: abartlet
Date: 2006-09-06 10:34:18 + (Wed, 06 Sep 2006)
New Revision: 18155
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18155
Log:
Add my work in progress, a module to link with Cyrus-SASL, for a
DIGEST-MD5 implemenation in particular.
However, I can't make this work: Cyrus-SASL isn't loading the mech...
Andrew Bartlett
Added:
branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
Modified:
branches/SAMBA_4_0/source/auth/config.m4
branches/SAMBA_4_0/source/auth/gensec/config.mk
branches/SAMBA_4_0/source/auth/gensec/gensec.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.m4
===
--- branches/SAMBA_4_0/source/auth/config.m42006-09-06 10:30:17 UTC (rev
18154)
+++ branches/SAMBA_4_0/source/auth/config.m42006-09-06 10:34:18 UTC (rev
18155)
@@ -17,3 +17,13 @@
SMB_EXT_LIB(CRYPT, $CRYPT_LIBS)
AC_CHECK_FUNCS(crypt16 getauthuid getpwanam)
+
+AC_CHECK_HEADERS(sasl/sasl.h)
+AC_CHECK_LIB_EXT(sasl2, SASL_LIBS, sasl_client_init)
+SMB_EXT_LIB(SASL, $SASL_LIBS)
+
+if test x$ac_cv_header_sasl_sasl_h = xyes -a
x$ac_cv_lib_ext_sasl2_sasl_client_init = xyes;then
+ SMB_ENABLE(cyrus_sasl,YES)
+else
+ SMB_ENABLE(cyrus_sasl, NO)
+fi
Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===
--- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-09-06 10:30:17 UTC
(rev 18154)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-09-06 10:34:18 UTC
(rev 18155)
@@ -33,6 +33,16 @@
+# Start MODULE cyrus_sasl
+[MODULE::cyrus_sasl]
+SUBSYSTEM = gensec
+INIT_FUNCTION = gensec_sasl_init
+OBJ_FILES = cyrus_sasl.o
+PUBLIC_DEPENDENCIES = SASL auth
+# End MODULE cyrus_sasl
+
+
+
# Start MODULE gensec_spnego
[MODULE::gensec_spnego]
SUBSYSTEM = gensec
Added: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
===
--- branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-06 10:30:17 UTC
(rev 18154)
+++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-06 10:34:18 UTC
(rev 18155)
@@ -0,0 +1,413 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Connect GENSEC to an external SASL lib
+
+ Copyright (C) Andrew Bartlett [EMAIL PROTECTED] 2006
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include auth/auth.h
+#include lib/socket/socket.h
+#include sasl/sasl.h
+
+struct gensec_sasl_state {
+ sasl_conn_t *conn;
+ int step;
+};
+
+static NTSTATUS sasl_nt_status(int sasl_ret)
+{
+ switch (sasl_ret) {
+ case SASL_CONTINUE:
+ return NT_STATUS_MORE_PROCESSING_REQUIRED;
+ case SASL_NOMEM:
+ return NT_STATUS_NO_MEMORY;
+ case SASL_BADPARAM:
+ case SASL_NOMECH:
+ return NT_STATUS_INVALID_PARAMETER;
+ case SASL_BADMAC:
+ return NT_STATUS_ACCESS_DENIED;
+ case SASL_OK:
+ return NT_STATUS_OK;
+ default:
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+}
+
+static int gensec_sasl_get_user(void *context, int id,
+ const char **result, unsigned *len)
+{
+ struct gensec_security *gensec_security = talloc_get_type(context,
struct gensec_security);
+ const char *username =
cli_credentials_get_username(gensec_get_credentials(gensec_security));
+ if (id != SASL_CB_USER id != SASL_CB_AUTHNAME) {
+ return SASL_FAIL;
+ }
+
+ *result = username;
+ return SASL_OK;
+}
+
+static int gensec_sasl_get_realm(void *context, int id,
+const char **availrealms,
+const char **result)
+{
+ struct gensec_security *gensec_security = talloc_get_type(context,
struct gensec_security);
+ const char *realm =
cli_credentials_get_realm(gensec_get_credentials(gensec_security));
+ int i;
+ if (id != SASL_CB_GETREALM) {
+ return SASL_FAIL;
+ }
+
+ for (i=0;
svn commit: samba r18157 - in branches/SAMBA_4_0/source/lib/popt: .
Author: jelmer
Date: 2006-09-06 10:50:52 + (Wed, 06 Sep 2006)
New Revision: 18157
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18157
Log:
Fix building with external popt.
Modified:
branches/SAMBA_4_0/source/lib/popt/libpopt.m4
branches/SAMBA_4_0/source/lib/popt/samba.m4
Changeset:
Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4
===
--- branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2006-09-06 10:40:36 UTC
(rev 18156)
+++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2006-09-06 10:50:52 UTC
(rev 18157)
@@ -1,14 +1,39 @@
-dnl find the popt sources. This is meant to work both for
-dnl popt standalone builds, and builds of packages using popt
-poptdir=
-for d in $srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt; do
- if test -f $d/popt.c; then
- poptdir=$d
- AC_SUBST(poptdir)
- break;
+dnl Check to see if we should use the included popt
+
+INCLUDED_POPT=auto
+AC_ARG_WITH(included-popt,
+[ --with-included-poptuse bundled popt library, not from system],
+[ INCLUDED_POPT=$withval ])
+
+AC_SUBST(POPT_LIBS)
+AC_SUBST(POPT_CFLAGS)
+
+if test x$INCLUDED_POPT != xyes; then
+ AC_CHECK_HEADERS(popt.h)
+ AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS=-lpopt ])
+ if test x$ac_cv_header_popt_h = xno; then
+ INCLUDED_POPT=yes
+ POPT_CFLAGS=
+ else
+ INCLUDED_POPT=no
fi
-done
-POPTOBJ=popt.o findme.o poptconfig.o popthelp.o poptparse.o
-AC_SUBST(POPTOBJ)
+fi
-AC_CHECK_HEADERS([float.h alloca.h])
+AC_MSG_CHECKING(whether to use included popt)
+AC_MSG_RESULT($INCLUDED_POPT)
+if test x$INCLUDED_POPT != xno; then
+ dnl find the popt sources. This is meant to work both for
+ dnl popt standalone builds, and builds of packages using popt
+ poptdir=
+ for d in $srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt;
do
+ if test -f $d/popt.c; then
+ poptdir=$d
+ POPT_CFLAGS=-I$d
+ AC_SUBST(poptdir)
+ break
+ fi
+ done
+ POPTOBJ=popt.o findme.o poptconfig.o popthelp.o poptparse.o
+ AC_SUBST(POPTOBJ)
+ AC_CHECK_HEADERS([float.h alloca.h])
+fi
Modified: branches/SAMBA_4_0/source/lib/popt/samba.m4
===
--- branches/SAMBA_4_0/source/lib/popt/samba.m4 2006-09-06 10:40:36 UTC (rev
18156)
+++ branches/SAMBA_4_0/source/lib/popt/samba.m4 2006-09-06 10:50:52 UTC (rev
18157)
@@ -1,3 +1,10 @@
m4_include(lib/popt/libpopt.m4)
-SMB_SUBSYSTEM(LIBPOPT,
+
+if test x$POPTOBJ = x; then
+ SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
+ SMB_ENABLE(LIBPOPT,YES)
+else
+ SMB_SUBSYSTEM(LIBPOPT,
[lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o
lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt])
+fi
+
svn commit: samba r18158 - in branches/SAMBA_3_0/source/nsswitch: .
Author: gd
Date: 2006-09-06 10:59:39 + (Wed, 06 Sep 2006)
New Revision: 18158
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18158
Log:
Stop winbindd from accumulating memory creds infinitely when doing
pam offline logons.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2006-09-06 10:50:52 UTC
(rev 18157)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2006-09-06 10:59:39 UTC
(rev 18158)
@@ -1152,15 +1152,15 @@
ccname = pam_getenv(pamh, KRB5CCNAME);
if (ccname == NULL) {
_pam_log_debug(ctrl, LOG_DEBUG, user has no KRB5CCNAME
environment);
- retval = PAM_SUCCESS;
- goto out;
}
strncpy(request.data.logoff.user, user,
sizeof(request.data.logoff.user) - 1);
- strncpy(request.data.logoff.krb5ccname, ccname,
- sizeof(request.data.logoff.krb5ccname) - 1);
+ if (ccname) {
+ strncpy(request.data.logoff.krb5ccname, ccname,
+ sizeof(request.data.logoff.krb5ccname) - 1);
+ }
pwd = getpwnam(user);
if (pwd == NULL) {
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-09-06 10:50:52 UTC
(rev 18157)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-09-06 10:59:39 UTC
(rev 18158)
@@ -1865,22 +1865,26 @@
state-request.data.logoff.krb5ccname
[sizeof(state-request.data.logoff.krb5ccname)-1]='\0';
- parse_domain_user(state-request.data.logoff.user, name_domain, user);
+ if (!parse_domain_user(state-request.data.logoff.user, name_domain,
user)) {
+ goto failed;
+ }
- domain = find_auth_domain(state, name_domain);
-
- if (domain == NULL) {
- set_auth_errors(state-response, NT_STATUS_NO_SUCH_USER);
- DEBUG(5, (Pam Logoff for %s returned %s
- (PAM: %d)\n,
- state-request.data.auth.user,
- state-response.data.auth.nt_status_string,
- state-response.data.auth.pam_error));
- request_error(state);
- return;
+ if ((domain = find_auth_domain(state, name_domain)) == NULL) {
+ goto failed;
}
sendto_domain(state, domain);
+ return;
+
+ failed:
+ set_auth_errors(state-response, NT_STATUS_NO_SUCH_USER);
+ DEBUG(5, (Pam Logoff for %s returned %s
+ (PAM: %d)\n,
+ state-request.data.auth.user,
+ state-response.data.auth.nt_status_string,
+ state-response.data.auth.pam_error));
+ request_error(state);
+ return;
}
enum winbindd_result winbindd_dual_pam_logoff(struct winbindd_domain *domain,
@@ -1899,6 +1903,11 @@
goto process_result;
}
+ if (state-request.data.logoff.krb5ccname[0] == '\0') {
+ result = NT_STATUS_OK;
+ goto process_result;
+ }
+
#ifdef HAVE_KRB5
if (state-request.data.logoff.uid 0) {
svn commit: samba r18159 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2006-09-06 11:20:43 + (Wed, 06 Sep 2006) New Revision: 18159 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18159 Log: always recreate the the archive and use -s (which does the same as ranlib) and see how portable it is metze Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/Makefile.in === --- branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 10:59:39 UTC (rev 18158) +++ branches/SAMBA_4_0/source/lib/replace/Makefile.in 2006-09-06 11:20:43 UTC (rev 18159) @@ -29,8 +29,7 @@ $(INSTALL) libreplace.a $(libdir) libreplace.a: $(OBJS) - ar -rv $@ $(OBJS) - @-ranlib $@ + ar -rcsv $@ $(OBJS) test: testsuite ./testsuite
svn commit: samba r18160 - in branches/SAMBA_4_0/source/lib: replace replace/system replace/test tdb/common
Author: tridge
Date: 2006-09-06 11:31:59 + (Wed, 06 Sep 2006)
New Revision: 18160
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18160
Log:
- pread and pwrite replacements need to be non-static
- replacing rename() is pointless - all platforms have it (and the
#define of rename breaks some code)
- use system/locale.h in snprintf.c
- fix passwd.h for initgroups
- stdlib is in replace.h, not needed elsewhere
- fix the initgroups replacement
- fix mapping of dl functions to rep_*
Modified:
branches/SAMBA_4_0/source/lib/replace/dlfcn.c
branches/SAMBA_4_0/source/lib/replace/getpass.c
branches/SAMBA_4_0/source/lib/replace/replace.c
branches/SAMBA_4_0/source/lib/replace/replace.h
branches/SAMBA_4_0/source/lib/replace/snprintf.c
branches/SAMBA_4_0/source/lib/replace/system/passwd.h
branches/SAMBA_4_0/source/lib/replace/test/testsuite.c
branches/SAMBA_4_0/source/lib/tdb/common/io.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/dlfcn.c
===
--- branches/SAMBA_4_0/source/lib/replace/dlfcn.c 2006-09-06 11:20:43 UTC
(rev 18159)
+++ branches/SAMBA_4_0/source/lib/replace/dlfcn.c 2006-09-06 11:31:59 UTC
(rev 18160)
@@ -24,7 +24,6 @@
*/
#include replace.h
-#include stdlib.h
#ifndef HAVE_DLOPEN
void *dlopen(const char *name, int flags)
@@ -41,7 +40,7 @@
#endif
#ifndef HAVE_DLERROR
-const char *dlerror(void)
+char *dlerror(void)
{
return dynamic loading of objects not supported on this platform;
}
Modified: branches/SAMBA_4_0/source/lib/replace/getpass.c
===
--- branches/SAMBA_4_0/source/lib/replace/getpass.c 2006-09-06 11:20:43 UTC
(rev 18159)
+++ branches/SAMBA_4_0/source/lib/replace/getpass.c 2006-09-06 11:31:59 UTC
(rev 18160)
@@ -19,7 +19,6 @@
/* Modified to use with samba by Jeremy Allison, 8th July 1995. */
#include replace.h
-#include stdlib.h
#if defined(HAVE_TERMIOS_H)
/* POSIX terminal handling. */
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 11:20:43 UTC
(rev 18159)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-09-06 11:31:59 UTC
(rev 18160)
@@ -30,6 +30,7 @@
#include system/syslog.h
#include system/network.h
#include system/locale.h
+#include system/wait.h
void replace_dummy(void);
void replace_dummy(void) {}
@@ -42,7 +43,7 @@
{
#ifdef HAVE_CHSIZE
return chsize(f,l);
-#else
+#elif defined(F_FREESP)
struct flock fl;
fl.l_whence = 0;
@@ -50,6 +51,8 @@
fl.l_start = l;
fl.l_type = F_WRLCK;
return fcntl(f, F_FREESP, fl);
+#else
+#error you must have a ftruncate function
#endif
}
#endif /* HAVE_FTRUNCATE */
@@ -151,24 +154,6 @@
#endif /* !HAVE_MKTIME */
-
-#ifndef HAVE_RENAME
-/* Rename a file. (from libiberty in GNU binutils) */
-int rep_rename(const char *zfrom, const char *zto)
-{
- if (link (zfrom, zto) 0)
-{
- if (errno != EEXIST)
- return -1;
- if (unlink (zto) 0
- || link (zfrom, zto) 0)
- return -1;
-}
- return unlink (zfrom);
-}
-#endif /* HAVE_RENAME */
-
-
#ifndef HAVE_INNETGR
#if defined(HAVE_SETNETGRENT) defined(HAVE_GETNETGRENT)
defined(HAVE_ENDNETGRENT)
/*
@@ -211,7 +196,7 @@
#include grp.h
gid_t *grouplst = NULL;
- int max_gr = groups_max();
+ int max_gr = 32;
int ret;
inti,j;
struct group *g;
@@ -481,7 +466,7 @@
#endif
#ifndef HAVE_PREAD
-static ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t
__offset)
+ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset)
{
if (lseek(__fd, __offset, SEEK_SET) != __offset) {
return -1;
@@ -491,7 +476,7 @@
#endif
#ifndef HAVE_PWRITE
-static ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t
__offset)
+ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t
__offset)
{
if (lseek(__fd, __offset, SEEK_SET) != __offset) {
return -1;
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-06 11:20:43 UTC
(rev 18159)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-06 11:31:59 UTC
(rev 18160)
@@ -61,7 +61,6 @@
#include strings.h
#endif
-
#ifndef HAVE_STRERROR
extern char *sys_errlist[];
#define strerror(i) sys_errlist[i]
@@ -121,11 +120,6 @@
int rep_setenv(const char *name, const char *value, int overwrite);
#endif
-#ifndef HAVE_RENAME
-#define rename rep_rename
-int rep_rename(const char *zfrom, const char *zto);
-#endif
-
#ifndef HAVE_STRCASESTR
#define strcasestr rep_strcasestr
char
svn commit: samba r18161 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: jelmer Date: 2006-09-06 11:48:24 + (Wed, 06 Sep 2006) New Revision: 18161 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18161 Log: Fix LDB build after popt changes. Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 11:31:59 UTC (rev 18160) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 11:48:24 UTC (rev 18161) @@ -19,7 +19,7 @@ TESTS=test-tdb.sh @TESTS@ CFLAGS=-I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ - [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \ + @POPT_CFLAGS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \ -DLIBDIR=\$(libdir)\ -DSHLIBEXT=\@[EMAIL PROTECTED] -DUSE_MMAP=1 @CFLAGS@ LIB_FLAGS=-Llib -lldb @LIBS@
svn commit: samba r18162 - in branches: SAMBA_3_0/source/libads SAMBA_3_0_23/source/libads
Author: gd
Date: 2006-09-06 11:53:13 + (Wed, 06 Sep 2006)
New Revision: 18162
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18162
Log:
Close socket when the CLDAP request has failed.
Guenther
Modified:
branches/SAMBA_3_0/source/libads/cldap.c
branches/SAMBA_3_0_23/source/libads/cldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/cldap.c
===
--- branches/SAMBA_3_0/source/libads/cldap.c2006-09-06 11:48:24 UTC (rev
18161)
+++ branches/SAMBA_3_0/source/libads/cldap.c2006-09-06 11:53:13 UTC (rev
18162)
@@ -297,6 +297,7 @@
ret = send_cldap_netlogon(sock, realm, global_myname(), 6);
if (ret != 0) {
+ close(sock);
return False;
}
ret = recv_cldap_netlogon(sock, reply);
Modified: branches/SAMBA_3_0_23/source/libads/cldap.c
===
--- branches/SAMBA_3_0_23/source/libads/cldap.c 2006-09-06 11:48:24 UTC (rev
18161)
+++ branches/SAMBA_3_0_23/source/libads/cldap.c 2006-09-06 11:53:13 UTC (rev
18162)
@@ -295,6 +295,7 @@
ret = send_cldap_netlogon(sock, realm, global_myname(), 6);
if (ret != 0) {
+ close(sock);
return False;
}
ret = recv_cldap_netlogon(sock, reply);
svn commit: samba r18163 - in branches/SAMBA_4_0/source/lib/talloc: .
Author: jelmer Date: 2006-09-06 12:10:25 + (Wed, 06 Sep 2006) New Revision: 18163 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18163 Log: Remove defines for BOOL, False and True Modified: branches/SAMBA_4_0/source/lib/talloc/testsuite.c Changeset: Sorry, the patch is too large (588 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18163
svn commit: samba r18164 - in branches/SAMBA_4_0/source/auth: .
Author: metze Date: 2006-09-06 12:12:42 + (Wed, 06 Sep 2006) New Revision: 18164 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18164 Log: enable the SASL library if found metze Modified: branches/SAMBA_4_0/source/auth/config.m4 Changeset: Modified: branches/SAMBA_4_0/source/auth/config.m4 === --- branches/SAMBA_4_0/source/auth/config.m42006-09-06 12:10:25 UTC (rev 18163) +++ branches/SAMBA_4_0/source/auth/config.m42006-09-06 12:12:42 UTC (rev 18164) @@ -23,7 +23,8 @@ SMB_EXT_LIB(SASL, $SASL_LIBS) if test x$ac_cv_header_sasl_sasl_h = xyes -a x$ac_cv_lib_ext_sasl2_sasl_client_init = xyes;then + SMB_ENABLE(SASL,YES) SMB_ENABLE(cyrus_sasl,YES) else - SMB_ENABLE(cyrus_sasl, NO) + SMB_ENABLE(cyrus_sasl,NO) fi
svn commit: samba r18165 - in branches: SAMBA_3_0/source/libads SAMBA_3_0_23/source/libads
Author: gd
Date: 2006-09-06 12:14:58 + (Wed, 06 Sep 2006)
New Revision: 18165
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18165
Log:
Fix memleaks.
Guenther
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
branches/SAMBA_3_0_23/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-09-06 12:12:42 UTC (rev
18164)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-09-06 12:14:58 UTC (rev
18165)
@@ -2260,10 +2260,15 @@
return status;
if (ads_count_replies(ads, res) != 1) {
+ ads_msgfree(ads, res);
return ADS_ERROR(LDAP_NO_RESULTS_RETURNED);
}
- ads_pull_uint32(ads, res, highestCommittedUSN, usn);
+ if (!ads_pull_uint32(ads, res, highestCommittedUSN, usn)) {
+ ads_msgfree(ads, res);
+ return ADS_ERROR(LDAP_NO_SUCH_ATTRIBUTE);
+ }
+
ads_msgfree(ads, res);
return ADS_SUCCESS;
}
@@ -2325,7 +2330,7 @@
timestr = ads_pull_string(ads_s, ctx, res, currentTime);
if (!timestr) {
- ads_msgfree(ads, res);
+ ads_msgfree(ads_s, res);
status = ADS_ERROR(LDAP_NO_RESULTS_RETURNED);
goto done;
}
Modified: branches/SAMBA_3_0_23/source/libads/ldap.c
===
--- branches/SAMBA_3_0_23/source/libads/ldap.c 2006-09-06 12:12:42 UTC (rev
18164)
+++ branches/SAMBA_3_0_23/source/libads/ldap.c 2006-09-06 12:14:58 UTC (rev
18165)
@@ -2183,10 +2183,15 @@
return status;
if (ads_count_replies(ads, res) != 1) {
+ ads_msgfree(ads, res);
return ADS_ERROR(LDAP_NO_RESULTS_RETURNED);
}
- ads_pull_uint32(ads, res, highestCommittedUSN, usn);
+ if (!ads_pull_uint32(ads, res, highestCommittedUSN, usn)) {
+ ads_msgfree(ads, res);
+ return ADS_ERROR(LDAP_NO_SUCH_ATTRIBUTE);
+ }
+
ads_msgfree(ads, res);
return ADS_SUCCESS;
}
@@ -2248,7 +2253,7 @@
timestr = ads_pull_string(ads_s, ctx, res, currentTime);
if (!timestr) {
- ads_msgfree(ads, res);
+ ads_msgfree(ads_s, res);
status = ADS_ERROR(LDAP_NO_RESULTS_RETURNED);
goto done;
}
svn commit: samba r18166 - in branches/SAMBA_4_0/source/lib/ldb: .
Author: jelmer Date: 2006-09-06 12:18:15 + (Wed, 06 Sep 2006) New Revision: 18166 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18166 Log: Fix build with external popt. Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in === --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 12:14:58 UTC (rev 18165) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2006-09-06 12:18:15 UTC (rev 18166) @@ -22,7 +22,7 @@ @POPT_CFLAGS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \ -DLIBDIR=\$(libdir)\ -DSHLIBEXT=\@[EMAIL PROTECTED] -DUSE_MMAP=1 @CFLAGS@ -LIB_FLAGS=-Llib -lldb @LIBS@ +LIB_FLAGS=-Llib -lldb @LIBS@ @POPT_LIBS@ LDB_TDB_DIR=ldb_tdb LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \
svn commit: samba r18167 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_23/source/nsswitch
Author: gd
Date: 2006-09-06 12:21:13 + (Wed, 06 Sep 2006)
New Revision: 18167
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18167
Log:
Adding DEBUG() to winbinds refresh seqnum to track down a failure.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_23/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-09-06 12:18:15 UTC
(rev 18166)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-09-06 12:21:13 UTC
(rev 18167)
@@ -444,6 +444,7 @@
status = domain-backend-sequence_number(domain,
domain-sequence_number);
if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10,(refresh_sequence_number: failed with %s\n,
nt_errstr(status)));
domain-sequence_number = DOM_SEQUENCE_NONE;
}
Modified: branches/SAMBA_3_0_23/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_23/source/nsswitch/winbindd_cache.c 2006-09-06
12:18:15 UTC (rev 18166)
+++ branches/SAMBA_3_0_23/source/nsswitch/winbindd_cache.c 2006-09-06
12:21:13 UTC (rev 18167)
@@ -444,6 +444,7 @@
status = domain-backend-sequence_number(domain,
domain-sequence_number);
if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10,(refresh_sequence_number: failed with %s\n,
nt_errstr(status)));
domain-sequence_number = DOM_SEQUENCE_NONE;
}
svn commit: samba r18168 - in branches/SAMBA_4_0/source: client include lib/cmdline lib/ldb/tools lib/registry/tools smbd torture utils utils/net
Author: jelmer
Date: 2006-09-06 12:28:01 + (Wed, 06 Sep 2006)
New Revision: 18168
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18168
Log:
Use {NULL} rather than POPT_TABLEEND, which is not always available.
Modified:
branches/SAMBA_4_0/source/client/cifsdd.c
branches/SAMBA_4_0/source/client/client.c
branches/SAMBA_4_0/source/include/core.h
branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
branches/SAMBA_4_0/source/lib/cmdline/popt_common.h
branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c
branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
branches/SAMBA_4_0/source/smbd/server.c
branches/SAMBA_4_0/source/torture/smbiconv.c
branches/SAMBA_4_0/source/torture/smbtorture.c
branches/SAMBA_4_0/source/utils/ndrdump.c
branches/SAMBA_4_0/source/utils/net/net.c
branches/SAMBA_4_0/source/utils/ntlm_auth.c
branches/SAMBA_4_0/source/utils/testparm.c
Changeset:
Modified: branches/SAMBA_4_0/source/client/cifsdd.c
===
--- branches/SAMBA_4_0/source/client/cifsdd.c 2006-09-06 12:21:13 UTC (rev
18167)
+++ branches/SAMBA_4_0/source/client/cifsdd.c 2006-09-06 12:28:01 UTC (rev
18168)
@@ -516,7 +516,7 @@
{ NULL, '\0', POPT_ARG_CALLBACK, (void *)cifsdd_help_message, '\0', NULL,
NULL },
{ help, '?', 0, NULL, '?', Show this help message, NULL },
{ usage, '\0', 0, NULL, 'u', Display brief usage message, NULL },
-POPT_TABLEEND
+ { NULL }
} ;
int main(int argc, const char ** argv)
@@ -533,7 +533,7 @@
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
- POPT_TABLEEND
+ { NULL }
};
/* Block sizes. */
Modified: branches/SAMBA_4_0/source/client/client.c
===
--- branches/SAMBA_4_0/source/client/client.c 2006-09-06 12:21:13 UTC (rev
18167)
+++ branches/SAMBA_4_0/source/client/client.c 2006-09-06 12:28:01 UTC (rev
18168)
@@ -3090,7 +3090,7 @@
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
POPT_COMMON_VERSION
- POPT_TABLEEND
+ { NULL }
};
mem_ctx = talloc_init(client.c/main);
Modified: branches/SAMBA_4_0/source/include/core.h
===
--- branches/SAMBA_4_0/source/include/core.h2006-09-06 12:21:13 UTC (rev
18167)
+++ branches/SAMBA_4_0/source/include/core.h2006-09-06 12:28:01 UTC (rev
18168)
@@ -26,11 +26,6 @@
#include libcli/util/nt_status.h
-typedef bool BOOL;
-
-#define False false
-#define True true
-
/* used to hold an arbitrary blob of data */
typedef struct datablob {
uint8_t *data;
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2006-09-06 12:21:13 UTC
(rev 18167)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2006-09-06 12:28:01 UTC
(rev 18168)
@@ -151,7 +151,7 @@
{ workgroup, 'W', POPT_ARG_STRING, NULL, 'W', Set the workgroup
name, WORKGROUP },
{ scope, 'i', POPT_ARG_STRING, NULL, 'i', Use this Netbios scope,
SCOPE },
{ maxprotocol, 'm', POPT_ARG_STRING, NULL, 'm', Set max protocol
level, MAXPROTOCOL },
- POPT_TABLEEND
+ { NULL }
};
struct poptOption popt_common_samba[] = {
@@ -163,12 +163,12 @@
{ log-basename, 'l', POPT_ARG_STRING, NULL, 'l', Basename for
log/debug files, LOGFILEBASE },
{ leak-report, 0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT, enable
talloc leak reporting on exit, NULL },
{ leak-report-full,0, POPT_ARG_NONE, NULL, OPT_LEAK_REPORT_FULL,
enable full talloc leak reporting on exit, NULL },
- POPT_TABLEEND
+ { NULL }
};
struct poptOption popt_common_version[] = {
{ NULL, 0, POPT_ARG_CALLBACK, popt_common_callback },
{ version, 'V', POPT_ARG_NONE, NULL, 'V', Print version },
- POPT_TABLEEND
+ { NULL }
};
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.h
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2006-09-06 12:21:13 UTC
(rev 18167)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2006-09-06 12:28:01 UTC
(rev 18168)
@@ -29,10 +29,6 @@
extern struct poptOption popt_common_version[];
extern struct poptOption popt_common_credentials[];
-#ifndef POPT_TABLEEND
-#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
-#endif
-
#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE,
svn commit: samba r18169 - in branches/SAMBA_4_0/source/include: .
Author: jelmer
Date: 2006-09-06 12:29:05 + (Wed, 06 Sep 2006)
New Revision: 18169
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18169
Log:
Remove accidentally committed bits
Modified:
branches/SAMBA_4_0/source/include/core.h
Changeset:
Modified: branches/SAMBA_4_0/source/include/core.h
===
--- branches/SAMBA_4_0/source/include/core.h2006-09-06 12:28:01 UTC (rev
18168)
+++ branches/SAMBA_4_0/source/include/core.h2006-09-06 12:29:05 UTC (rev
18169)
@@ -26,6 +26,11 @@
#include libcli/util/nt_status.h
+typedef bool BOOL;
+
+#define False false
+#define True true
+
/* used to hold an arbitrary blob of data */
typedef struct datablob {
uint8_t *data;
svn commit: samba r18170 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_23/source/utils
Author: gd
Date: 2006-09-06 12:29:45 + (Wed, 06 Sep 2006)
New Revision: 18170
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18170
Log:
Make sure to actually get the printing data before trying to publish it
in AD.
Guenther
Modified:
branches/SAMBA_3_0/source/utils/net_ads.c
branches/SAMBA_3_0_23/source/utils/net_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===
--- branches/SAMBA_3_0/source/utils/net_ads.c 2006-09-06 12:29:05 UTC (rev
18169)
+++ branches/SAMBA_3_0/source/utils/net_ads.c 2006-09-06 12:29:45 UTC (rev
18170)
@@ -1719,8 +1719,11 @@
return -1;
}
- get_remote_printer_publishing_data(pipe_hnd, mem_ctx, mods,
- printername);
+ if (!W_ERROR_IS_OK(get_remote_printer_publishing_data(pipe_hnd,
mem_ctx, mods,
+ printername))) {
+ ads_destroy(ads);
+ return -1;
+ }
rc = ads_add_printer_entry(ads, prt_dn, mem_ctx, mods);
if (!ADS_ERR_OK(rc)) {
Modified: branches/SAMBA_3_0_23/source/utils/net_ads.c
===
--- branches/SAMBA_3_0_23/source/utils/net_ads.c2006-09-06 12:29:05 UTC
(rev 18169)
+++ branches/SAMBA_3_0_23/source/utils/net_ads.c2006-09-06 12:29:45 UTC
(rev 18170)
@@ -1525,8 +1525,11 @@
return -1;
}
- get_remote_printer_publishing_data(pipe_hnd, mem_ctx, mods,
- printername);
+ if (!W_ERROR_IS_OK(get_remote_printer_publishing_data(pipe_hnd,
mem_ctx, mods,
+ printername))) {
+ ads_destroy(ads);
+ return -1;
+ }
rc = ads_add_printer_entry(ads, prt_dn, mem_ctx, mods);
if (!ADS_ERR_OK(rc)) {
svn commit: samba r18171 - in branches/SAMBA_4_0/source/script: .
Author: jelmer
Date: 2006-09-06 12:30:26 + (Wed, 06 Sep 2006)
New Revision: 18171
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18171
Log:
Generate prototypes for functions returning bool.
Modified:
branches/SAMBA_4_0/source/script/mkproto.pl
Changeset:
Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===
--- branches/SAMBA_4_0/source/script/mkproto.pl 2006-09-06 12:29:45 UTC (rev
18170)
+++ branches/SAMBA_4_0/source/script/mkproto.pl 2006-09-06 12:30:26 UTC (rev
18171)
@@ -125,13 +125,14 @@
{
my ($file,$line) = @_;
- if ($line =~ /^_PUBLIC_
FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|CHAR|INTEGER|LIST)\((\w+),.*\)/o) {
+ if ($line =~ /^_PUBLIC_
FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o)
{
my $scope = $1;
my $type = $2;
my $name = $3;
my %tmap = (
BOOL = BOOL ,
+ bool = bool ,
CONST_STRING = const char *,
STRING = const char *,
INTEGER = int ,
@@ -182,7 +183,7 @@
}
next unless ( $is_public || $line =~ /
-
^void|^BOOL|^int|^struct|^char|^const|^\w+_[tT]\s|^uint|^unsigned|^long|
+
^void|^BOOL|^bool|^int|^struct|^char|^const|^\w+_[tT]\s|^uint|^unsigned|^long|
^NTSTATUS|^ADS_STATUS|^enum\s.*\(|^DATA_BLOB|^WERROR|^XFILE|^FILE|^DIR|
^double|^TDB_CONTEXT|^TDB_DATA|^TALLOC_CTX|^NTTIME|^FN_|^init_module|
^GtkWidget|^GType|^smb_ucs2_t
svn commit: samba r18172 - in branches: SAMBA_3_0/source/libads SAMBA_3_0_23/source/libads
Author: gd
Date: 2006-09-06 12:34:00 + (Wed, 06 Sep 2006)
New Revision: 18172
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18172
Log:
Just a little more verbosity in this debug statement.
Guenther
Modified:
branches/SAMBA_3_0/source/libads/ldap_utils.c
branches/SAMBA_3_0_23/source/libads/ldap_utils.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap_utils.c
===
--- branches/SAMBA_3_0/source/libads/ldap_utils.c 2006-09-06 12:30:26 UTC
(rev 18171)
+++ branches/SAMBA_3_0/source/libads/ldap_utils.c 2006-09-06 12:34:00 UTC
(rev 18172)
@@ -85,8 +85,8 @@
*res = NULL;
status = ads_do_search_all_args(ads, bp, scope, expr, attrs,
args, res);
if (ADS_ERR_OK(status)) {
- DEBUG(5,(Search for %s gave %d replies\n,
-expr, ads_count_replies(ads, *res)));
+ DEBUG(5,(Search for filter: %s, base: %s gave %d
replies\n,
+expr, bp, ads_count_replies(ads, *res)));
SAFE_FREE(bp);
return status;
}
Modified: branches/SAMBA_3_0_23/source/libads/ldap_utils.c
===
--- branches/SAMBA_3_0_23/source/libads/ldap_utils.c2006-09-06 12:30:26 UTC
(rev 18171)
+++ branches/SAMBA_3_0_23/source/libads/ldap_utils.c2006-09-06 12:34:00 UTC
(rev 18172)
@@ -84,8 +84,8 @@
*res = NULL;
status = ads_do_search_all_args(ads, bp, scope, expr, attrs,
args, res);
if (ADS_ERR_OK(status)) {
- DEBUG(5,(Search for %s gave %d replies\n,
-expr, ads_count_replies(ads, *res)));
+ DEBUG(5,(Search for filter: %s, base: %s gave %d
replies\n,
+expr, bp, ads_count_replies(ads, *res)));
SAFE_FREE(bp);
return status;
}
svn commit: lorikeet r560 - in trunk/mod_ntlm_winbind: .
Author: jerry Date: 2006-09-06 12:42:36 + (Wed, 06 Sep 2006) New Revision: 560 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=560 Log: Small patch from Kevin Shanahan [EMAIL PROTECTED] Fixes a typo in the default ntlm_auth calls. Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c Changeset: Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c === --- trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-09-01 06:54:33 UTC (rev 559) +++ trunk/mod_ntlm_winbind/mod_ntlm_winbind.c 2006-09-06 12:42:36 UTC (rev 560) @@ -931,7 +931,7 @@ crec-ntlm_basic_on = 0; crec-ntlm_basic_realm = REALM; crec-ntlm_auth_helper = ntlm_auth --helper-protocol=squid-2.5-ntlmssp; -crec-negotiate_ntlm_auth_helper = ntlm_auth --helper-prototocol=gss-spnego; +crec-negotiate_ntlm_auth_helper = ntlm_auth --helper-protocol=gss-spnego; crec-ntlm_plaintext_helper = ntlm_auth --helper-protocol=squid-2.5-basic; return crec;
svn commit: samba r18173 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2006-09-06 12:59:44 + (Wed, 06 Sep 2006)
New Revision: 18173
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18173
Log:
PICSUFFIX isn't used anymore
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_ld.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2006-09-06 12:34:00 UTC
(rev 18172)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2006-09-06 12:59:44 UTC
(rev 18173)
@@ -27,7 +27,6 @@
SONAMEFLAG=
SHLD=\${CC}
PICFLAG=
-PICSUFFIX=po
SHLIBEXT=so
AC_MSG_CHECKING([ability to build shared libraries])
@@ -56,7 +55,6 @@
## ${CFLAGS} added for building 64-bit shared
## libs using Sun's Compiler
LDSHFLAGS=-G \${CFLAGS}
- PICSUFFIX=po.o
fi
;;
*sunos*)
@@ -177,7 +175,7 @@
AC_MSG_CHECKING([linker flags for shared libraries])
AC_MSG_RESULT([$LDSHFLAGS])
AC_MSG_CHECKING([compiler flags for position-independent code])
-AC_MSG_RESULT([$PICFLAGS])
+AC_MSG_RESULT([$PICFLAG])
###
# test whether building a shared library actually works
@@ -186,17 +184,10 @@
[ac_cv_shlib_works],[
ac_cv_shlib_works=no
# try building a trivial shared library
- if test $PICSUFFIX = po; then
- $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po
${srcdir-.}/build/tests/shlib.c
- $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.so shlib.po
+ ${CC} ${CFLAGS} ${PICFLAG} -c ${srcdir-.}/build/tests/shlib.c -o shlib.o
+ ${SHLD} ${LDSHFLAGS} `eval echo ${LDFLAGS}` -o shlib.${SHLIBEXT}
shlib.o
ac_cv_shlib_works=yes
- else
- $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.$PICSUFFIX
${srcdir-.}/build/tests/shlib.c
- mv shlib.$PICSUFFIX shlib.po
- $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o shlib.so shlib.po
- ac_cv_shlib_works=yes
- fi
- rm -f shlib.so shlib.po
+ rm -f shlib.${SHLIBEXT} shlib.o
])
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
svn commit: samba r18176 - in branches/SAMBA_4_0/source/lib/registry: .
Author: tridge Date: 2006-09-06 13:15:37 + (Wed, 06 Sep 2006) New Revision: 18176 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18176 Log: reg_util.c needs LIBREPLACE for strndup Modified: branches/SAMBA_4_0/source/lib/registry/config.mk Changeset: Modified: branches/SAMBA_4_0/source/lib/registry/config.mk === --- branches/SAMBA_4_0/source/lib/registry/config.mk2006-09-06 13:13:12 UTC (rev 18175) +++ branches/SAMBA_4_0/source/lib/registry/config.mk2006-09-06 13:15:37 UTC (rev 18176) @@ -99,7 +99,7 @@ reg_samba.o \ patchfile.o PUBLIC_DEPENDENCIES = \ - LIBSAMBA-UTIL CHARSET + LIBSAMBA-UTIL CHARSET LIBREPLACE PRIVATE_PROTO_HEADER = registry_proto.h PUBLIC_HEADERS = registry.h # End MODULE registry_ldb
svn commit: samba r18178 - in branches/SAMBA_4_0/source/torture: .
Author: tridge Date: 2006-09-06 13:29:25 + (Wed, 06 Sep 2006) New Revision: 18178 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18178 Log: another place needs LIBREPLACE to get strndup metze or jelmer, is there some way we can get LIBREPLACE in globally? We're going to be chasing these forever! Modified: branches/SAMBA_4_0/source/torture/config.mk Changeset: Modified: branches/SAMBA_4_0/source/torture/config.mk === --- branches/SAMBA_4_0/source/torture/config.mk 2006-09-06 13:20:06 UTC (rev 18177) +++ branches/SAMBA_4_0/source/torture/config.mk 2006-09-06 13:29:25 UTC (rev 18178) @@ -9,7 +9,7 @@ torture.o PUBLIC_DEPENDENCIES = \ LIBSAMBA-CONFIG \ - LIBSAMBA-UTIL + LIBSAMBA-UTIL LIBREPLACE [SUBSYSTEM::TORTURE_UTIL] OBJ_FILES = util.o util_smb.o
svn commit: samba r18179 - in branches/SAMBA_4_0/source/build/m4: .
Author: metze
Date: 2006-09-06 14:29:57 + (Wed, 06 Sep 2006)
New Revision: 18179
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18179
Log:
- move CC specific stuff to check_cc.m4
- add some AC_DEFINES to rewrite.m4
(I'll remove them from check_ld.m4 soon)
(I've also merged new values from samba3)
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_cc.m4
branches/SAMBA_4_0/source/build/m4/rewrite.m4
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 13:29:25 UTC
(rev 18178)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 14:29:57 UTC
(rev 18179)
@@ -198,6 +198,49 @@
CFLAGS=${OLD_CFLAGS}
fi
+#
+# Config CPPFLAG settings for strange OS's that must be set
+# before other tests.
+#
+case $host_os in
+ # Try to work out if this is the native HPUX compiler that uses the -Ae
flag.
+ *hpux*)
+ AC_PROG_CC_FLAG(Ae)
+ # mmap on HPUX is completely broken...
+ AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken])
+ if test $ac_cv_prog_cc_Ae = yes; then
+ CPPFLAGS=$CPPFLAGS -Ae
+ fi
+ ;;
+
+ *aix*)
+ if test ${GCC} != yes; then
+ ## for funky AIX compiler using strncpy()
+ CFLAGS=$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000
+ fi
+ ;;
+
+ #
+ # VOS may need to have POSIX support and System V compatibility enabled.
+ #
+ *vos*)
+ case $CPPFLAGS in
+ *-D_POSIX_C_SOURCE*);;
+ *)
+ CPPFLAGS=$CPPFLAGS -D_POSIX_C_SOURCE=200112L
+ AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Whether to
enable POSIX support])
+ ;;
+ esac
+ case $CPPFLAGS in
+ *-D_SYSV*|*-D_SVID_SOURCE*);;
+ *)
+ CPPFLAGS=$CPPFLAGS -D_SYSV
+ AC_DEFINE(_SYSV, 1, [Whether to enable System V
compatibility])
+ ;;
+ esac
+ ;;
+esac
+
# allow for --with-hostcc=gcc
AC_ARG_WITH(hostcc,[ --with-hostcc=compilerchoose host compiler],
[HOSTCC=$withval],
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-09-06 13:29:25 UTC
(rev 18178)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-09-06 14:29:57 UTC
(rev 18179)
@@ -1,42 +1,67 @@
AC_SYS_LARGEFILE
-#
-# Config CPPFLAG settings for strange OS's that must be set
-# before other tests.
-#
case $host_os in
-# Try to work out if this is the native HPUX compiler that uses the -Ae flag.
-*hpux*)
- AC_PROG_CC_FLAG(Ae)
- # mmap on HPUX is completely broken...
- AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken])
- if test $ac_cv_prog_cc_Ae = yes; then
-CPPFLAGS=$CPPFLAGS -Ae
- fi
-;;
-#
-# VOS may need to have POSIX support and System V compatibility enabled.
-#
-*vos*)
- case $CPPFLAGS in
- *-D_POSIX_C_SOURCE*)
+ *linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux])
;;
- *)
- CPPFLAGS=$CPPFLAGS -D_POSIX_C_SOURCE=200112L
- AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Whether to enable POSIX
support])
+ *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
;;
- esac
- case $CPPFLAGS in
-*-D_SYSV*|*-D_SVID_SOURCE*)
+ *sunos*) AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
;;
-*)
- CPPFLAGS=$CPPFLAGS -D_SYSV
- AC_DEFINE(_SYSV, 1, [Whether to enable System V compatibility])
- esac
-;;
-
+ *netbsd* | *freebsd* | *dragonfly* )
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
+ ;;
+ *openbsd*)
+ AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
+ ;;
+ *irix*) AC_DEFINE(IRIX,1,[Whether the host os is irix])
+ case $host_os in
+ *irix6*) AC_DEFINE(IRIX6,1,[Whether the host os is irix6])
+ ;;
+ esac
+ ;;
+ *aix*) AC_DEFINE(AIX,1,[Whether the host os is aix])
+ AC_DEFINE(BROKEN_STRNLEN,1,[Does strnlen work correctly])
+ AC_DEFINE(BROKEN_STRNDUP,1,[Does strndup work correctly])
+
svn commit: samba r18180 - in branches/tmp/vl-messaging/source: include lib torture
Author: jmcd
Date: 2006-09-06 14:50:52 + (Wed, 06 Sep 2006)
New Revision: 18180
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18180
Log:
From Aleksey Fedoseev,
The patch consists of several modifications:
1) added preallocation of incoming stream buffer (minus 1 malloc/free
per incoming message)
2) corrected program exit (cleaning up communication buffer / closing
dispatcher's sockets)
3) added message size test
Modified:
branches/tmp/vl-messaging/source/include/messages.h
branches/tmp/vl-messaging/source/lib/messages_socket.c
branches/tmp/vl-messaging/source/lib/messages_stream.c
branches/tmp/vl-messaging/source/torture/msgtest.c
Changeset:
Modified: branches/tmp/vl-messaging/source/include/messages.h
===
--- branches/tmp/vl-messaging/source/include/messages.h 2006-09-06 14:29:57 UTC
(rev 18179)
+++ branches/tmp/vl-messaging/source/include/messages.h 2006-09-06 14:50:52 UTC
(rev 18180)
@@ -125,6 +125,7 @@
struct message_list *prev, *next;
struct message_rec *msg;
size_t processed; /* number of read/written bytes */
+ size_t allocated; /* number of allocated bytes */
};
#endif
Modified: branches/tmp/vl-messaging/source/lib/messages_socket.c
===
--- branches/tmp/vl-messaging/source/lib/messages_socket.c 2006-09-06
14:29:57 UTC (rev 18179)
+++ branches/tmp/vl-messaging/source/lib/messages_socket.c 2006-09-06
14:50:52 UTC (rev 18180)
@@ -101,9 +101,7 @@
cleanup_messages(wait_send);
if (socket_fd = 0) {
- if (mtype == MESSAGING_TYPE_STREAM) {
- shutdown_stream_sockets();
- }
+ shutdown_stream_sockets();
close(socket_fd);
socket_fd = -1;
}
Modified: branches/tmp/vl-messaging/source/lib/messages_stream.c
===
--- branches/tmp/vl-messaging/source/lib/messages_stream.c 2006-09-06
14:29:57 UTC (rev 18179)
+++ branches/tmp/vl-messaging/source/lib/messages_stream.c 2006-09-06
14:50:52 UTC (rev 18180)
@@ -70,7 +70,7 @@
};
static struct messaging_client *clients_cache = NULL;
-static struct message_list *tcp_incoming = NULL;
+static struct message_list *disp_incoming = NULL;
static int dispatcher_pipe = -1;
/* approximate maximum number of connected clients in the list */
@@ -80,6 +80,8 @@
#define MESSAGING_DISPATCHER_SOCKETdispatcher
#define MESSAGING_DISPATCHER_LOCKFILE dispatcher.pid
+#define INITIAL_CONTAINER_SIZE 64
+
static const char *dispatch_path(void)
{
static char *name = NULL;
@@ -97,6 +99,56 @@
}
/
+ Allocate/reallocate message container
+/
+
+struct message_list *allocate_container(TALLOC_CTX *mem_ctx,
+ struct message_list *cnt,
+ size_t needsize)
+{
+ uint8_t *buffer;
+ size_t size = INITIAL_CONTAINER_SIZE;
+
+ while(size needsize) size *= 2;
+
+ if(cnt == NULL) {
+ cnt = TALLOC_ZERO_P(mem_ctx, struct message_list);
+ if(cnt == NULL) {
+ DEBUG(0, (talloc failed\n));
+ return NULL;
+ }
+ buffer = TALLOC_ARRAY(cnt, uint8_t, size);
+ if(buffer == NULL) {
+ DEBUG(0, (talloc failed\n));
+ TALLOC_FREE(cnt);
+ return NULL;
+ }
+ } else {
+
+ SMB_ASSERT(size cnt-allocated);
+
+ buffer = TALLOC_REALLOC_ARRAY(cnt, cnt-msg, uint8_t, size);
+ if(buffer == NULL) {
+ DEBUG(0, (realloc failed\n));
+ TALLOC_FREE(cnt-msg);
+ /* try to allocate with talloc */
+ buffer = TALLOC_ARRAY(cnt, uint8_t, size);
+ if(buffer == NULL) {
+ DEBUG(0, (talloc failed\n));
+ TALLOC_FREE(cnt);
+ return NULL;
+ }
+ }
+ }
+
+ cnt-msg = (struct message_rec*)buffer;
+ cnt-processed = (size_t)-1;
+ cnt-allocated = size;
+
+ return cnt;
+}
+
+/
Client's queue helper functions
/
@@ -145,7 +197,8 @@
for (client = clients_cache; client != NULL; client = client-next) {
clients_count++;
- if(client-outgoing == NULL
svn commit: samba r18181 - in branches/SAMBA_4_0/source: . build/m4 build/smb_build
Author: metze
Date: 2006-09-06 15:01:25 + (Wed, 06 Sep 2006)
New Revision: 18181
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18181
Log:
use:
CC and CFLAGS
LD and LDFLAGS
STLD and STLD_FLAGS
SHLD and SHLD_FLAGS
all controled by configure
and import the values from samba3 which are more recent
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_ld.m4
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/configure.ac
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4 2006-09-06 14:50:52 UTC
(rev 18180)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4 2006-09-06 15:01:25 UTC
(rev 18181)
@@ -5,187 +5,174 @@
dnl Released under the GNU GPL
dnl ---
dnl
-dnl Check if we use GNU ld
-AC_PATH_PROG(LD, ld)
+
+AC_PATH_PROG(PROG_LD,ld)
AC_PROG_LD_GNU
-AC_PATH_PROG(AR, ar)
+AC_PATH_PROG(PROG_AR, ar)
+AC_SUBST(STLD)
+AC_SUBST(STLD_FLAGS)
+AC_SUBST(BLDSHARED)
+AC_SUBST(LD)
+AC_SUBST(LDFLAGS)
+AC_SUBST(SHLD)
+AC_SUBST(SHLD_FLAGS)
AC_SUBST(SHLIBEXT)
-AC_SUBST(LDSHFLAGS)
AC_SUBST(SONAMEFLAG)
-AC_SUBST(DYNEXP)
AC_SUBST(PICFLAG)
-AC_SUBST(BLDSHARED)
# Assume non-shared by default and override below
-BLDSHARED=false
-
# these are the defaults, good for lots of systems
-DYNEXP=
-HOST_OS=$host_os
-LDSHFLAGS=-shared
+STLD=${PROG_AR}
+STLD_FLAGS=-rcs
+BLDSHARED=false
+LD=${CC}
+LDFLAGS=
+SHLD=${CC}
+SHLD_FLAGS=-shared
+SHLIBEXT=so
SONAMEFLAG=
-SHLD=\${CC}
PICFLAG=
-SHLIBEXT=so
AC_MSG_CHECKING([ability to build shared libraries])
# and these are for particular systems
case $host_os in
*linux*)
- AC_DEFINE(LINUX,1,[Whether the host os is linux])
BLDSHARED=true
- LDSHFLAGS=-shared
- DYNEXP=-Wl,--export-dynamic
- PICFLAG=-fPIC
+ if test ${ac_cv_gnu_ld_no_default_allow_shlib_undefined} =
yes; then
+ SHLD_FLAGS=-shared -Wl,-Bsymbolic
-Wl,--allow-shlib-undefined
+ else
+ SHLD_FLAGS=-shared -Wl,-Bsymbolic
+ fi
+ LDFLAGS=-Wl,--export-dynamic
+ PICFLAGS=-fPIC
SONAMEFLAG=-Wl,-soname=
;;
*solaris*)
- AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
BLDSHARED=true
- LDSHFLAGS=-G
+ SHLD_FLAGS=-G
+ SONAMEFLAG=-h
if test ${GCC} = yes; then
- PICFLAG=-fPIC
+ PICFLAGS=-fPIC
+ SONAMEFLAG=-Wl,-soname=
if test ${ac_cv_prog_gnu_ld} = yes; then
- DYNEXP=-Wl,-E
+ LDFLAGS=-Wl,-E
fi
else
- PICFLAG=-KPIC
+ PICFLAGS=-KPIC
## ${CFLAGS} added for building 64-bit shared
## libs using Sun's Compiler
- LDSHFLAGS=-G \${CFLAGS}
+ SHLD_FLAGS=-G \${CFLAGS}
fi
;;
*sunos*)
- AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
BLDSHARED=true
- LDSHFLAGS=-G
- PICFLAG=-KPIC # Is this correct for SunOS
+ SHLD_FLAGS=-G
+ SONAMEFLAG=-Wl,-h,
+ PICFLAGS=-KPIC # Is this correct for SunOS
;;
- *netbsd* | *freebsd*)
+ *netbsd* | *freebsd* | *dragonfly* )
BLDSHARED=true
- LDSHFLAGS=-shared
- DYNEXP=-Wl,--export-dynamic
- PICFLAG=-fPIC -DPIC
+ LDFLAGS=-Wl,--export-dynamic
+ SONAMEFLAG=-Wl,-soname,
+ PICFLAGS=-fPIC -DPIC
;;
*openbsd*)
BLDSHARED=true
- LDSHFLAGS=-shared
- DYNEXP=-Wl,-Bdynamic
- PICFLAG=-fPIC
+ LDFLAGS=-Wl,-Bdynamic
+ SONAMEFLAG=-Wl,-soname,
+ PICFLAGS=-fPIC
;;
*irix*)
- AC_DEFINE(IRIX,1,[Whether the host os is irix])
- ATTEMPT_WRAP32_BUILD=yes
BLDSHARED=true
- LDSHFLAGS=-set_version sgi1.0 -shared
+ SHLD_FLAGS=-set_version sgi1.0 -shared
SONAMEFLAG=-soname
- SHLD=\${LD}
+ SHLD=${PROG_LD}
if test ${GCC} = yes; then
- PICFLAG=-fPIC
+ PICFLAGS=-fPIC
else
- PICFLAG=-KPIC
+ PICFLAGS=-KPIC
fi
;;
*aix*)
-
Rev 9129: Add utility macros for torture tests in file:///home/jelmer/bzr.samba/4.0-unittest/
revno: 9129 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: unittest timestamp: Wed 2006-09-06 17:00:00 +0200 message: Add utility macros for torture tests modified: source/lib/crypto/sha1test.c source/torture/auth/ntlmssp.c source/torture/auth/pac.c source/torture/config.mk source/torture/local/binding_string.c source/torture/local/event.c source/torture/local/iconv.c source/torture/local/idtree.c source/torture/local/irpc.c source/torture/local/local.c source/torture/local/messaging.c source/torture/local/ndr.c source/torture/local/registry.c source/torture/local/resolve.c source/torture/local/sddl.c source/torture/local/socket.c source/torture/local/torture.c source/torture/local/util_file.c source/torture/local/util_strlist.c source/torture/smbtorture.c source/torture/torture.c source/torture/ui.c source/torture/ui.h source/torture/util_smb.c
Rev 9130: [merge] Upstream 4.0 in file:///home/jelmer/bzr.samba/4.0-unittest/
revno: 9130 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: unittest timestamp: Wed 2006-09-06 17:08:21 +0200 message: [merge] Upstream 4.0 removed: source/build/m4/smb_cc_features.m4 source/include/system/ source/include/system/README source/include/system/capability.h source/include/system/config.m4 source/include/system/dir.h source/include/system/filesys.h source/include/system/glob.h source/include/system/iconv.h source/include/system/kerberos.h source/include/system/locale.h source/include/system/network.h source/include/system/passwd.h source/include/system/printing.h source/include/system/readline.h source/include/system/select.h source/include/system/shmem.h source/include/system/syslog.h source/include/system/terminal.h source/include/system/time.h source/include/system/wait.h source/lib/ldb/config.m4 source/lib/ldb/configure.in source/lib/ldb/popt.m4 source/lib/ldb/replace/ source/lib/ldb/replace/config.m4 source/lib/ldb/replace/replace.c source/lib/ldb/replace/timegm.c source/lib/popt/config.m4 source/lib/replace/config.m4 source/lib/talloc/config.m4 source/lib/talloc/configure.in source/lib/tdb/config.m4 source/lib/tdb/configure.in added: source/auth/gensec/cyrus_sasl.c source/lib/ldb/configure.ac source/lib/ldb/libldb.m4 source/lib/popt/libpopt.m4 source/lib/popt/samba.m4 source/lib/replace/Makefile.in source/lib/replace/aclocal.m4 source/lib/replace/autogen.sh source/lib/replace/configure.ac source/lib/replace/install-sh source/lib/replace/libreplace.m4 source/lib/replace/libreplace_macros.m4 source/lib/replace/system/ source/lib/replace/system/README source/lib/replace/system/capability.h source/lib/replace/system/config.m4 source/lib/replace/system/dir.h source/lib/replace/system/filesys.h source/lib/replace/system/glob.h source/lib/replace/system/iconv.h source/lib/replace/system/kerberos.h source/lib/replace/system/locale.h source/lib/replace/system/network.h source/lib/replace/system/passwd.h source/lib/replace/system/printing.h source/lib/replace/system/readline.h source/lib/replace/system/select.h source/lib/replace/system/shmem.h source/lib/replace/system/syslog.h source/lib/replace/system/terminal.h source/lib/replace/system/time.h source/lib/replace/system/wait.h source/lib/replace/test/ source/lib/replace/test/testsuite.c source/lib/replace/timegm.c source/lib/talloc/aclocal.m4 source/lib/talloc/configure.ac source/lib/talloc/libtalloc.m4 source/lib/tdb/configure.ac source/lib/tdb/libtdb.m4 modified: .bzrignore source/aclocal.m4 source/auth/config.m4 source/auth/config.mk source/auth/gensec/config.mk source/auth/gensec/gensec.c source/auth/gensec/gensec.h source/auth/gensec/socket.c source/auth/gensec/socket.h source/auth/gensec/spnego.c source/autogen.sh source/build/m4/check_cc.m4 source/build/m4/check_ld.m4 source/build/m4/env.m4 source/build/m4/rewrite.m4 source/build/smb_build/makefile.pm source/client/cifsdd.c source/client/client.c source/configure.ac source/dsdb/samdb/ldb_modules/config.mk source/heimdal/lib/com_err/lex.c source/heimdal/lib/hdb/hdb.c source/heimdal_build/config.h source/heimdal_build/config.m4 source/include/includes.h source/lib/charset/config.mk source/lib/cmdline/popt_common.c source/lib/cmdline/popt_common.h source/lib/cmdline/popt_credentials.c source/lib/ldb/Makefile.in source/lib/ldb/aclocal.m4 source/lib/ldb/autogen.sh source/lib/ldb/common/attrib_handlers.c source/lib/ldb/common/ldb_ldif.c source/lib/ldb/common/ldb_parse.c source/lib/ldb/common/ldb_utf8.c source/lib/ldb/config.mk source/lib/ldb/docs/builddocs.sh source/lib/ldb/include/includes.h source/lib/ldb/tools/ad2oLschema.c source/lib/ldb/tools/cmdline.c source/lib/registry/config.mk source/lib/registry/tools/regdiff.c source/lib/registry/tools/regpatch.c source/lib/registry/tools/regshell.c source/lib/registry/tools/regtree.c source/lib/replace/README source/lib/replace/config.mk source/lib/replace/dlfcn.c source/lib/replace/getpass.c source/lib/replace/repdir/repdir.c source/lib/replace/replace.c source/lib/replace/replace.h source/lib/replace/snprintf.c source/lib/samba3/config.mk source/lib/smbreadline/readline.m4 source/lib/smbreadline/smbreadline.c source/lib/socket/config.mk source/lib/socket_wrapper/config.mk source/lib/talloc/Makefile.in source/lib/talloc/autogen.sh source/lib/talloc/config.mk source/lib/talloc/talloc.c source/lib/talloc/testsuite.c source/lib/tdb/Makefile.in source/lib/tdb/aclocal.m4 source/lib/tdb/autogen.sh source/lib/tdb/common/io.c source/lib/tdb/common/tdb_private.h source/lib/tdb/config.mk source/lib/tdb/tools/tdbbackup.c source/lib/tdb/tools/tdbdump.c source/lib/tdb/tools/tdbtest.c
svn commit: samba r18182 - in branches/SAMBA_3_0/source/lib: .
Author: jerry
Date: 2006-09-06 15:17:25 + (Wed, 06 Sep 2006)
New Revision: 18182
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18182
Log:
only grant privs to Administrators if privileges are enabled to avoid bopgus
error messages
Modified:
branches/SAMBA_3_0/source/lib/account_pol.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/account_pol.c
===
--- branches/SAMBA_3_0/source/lib/account_pol.c 2006-09-06 15:01:25 UTC (rev
18181)
+++ branches/SAMBA_3_0/source/lib/account_pol.c 2006-09-06 15:17:25 UTC (rev
18182)
@@ -303,8 +303,11 @@
/* BUILTIN\Administrators get everything -- *always* */
- if ( !grant_all_privileges( global_sid_Builtin_Administrators ) ) {
- DEBUG(0,(init_account_policy: Failed to grant privileges to
BUILTIN\\Administrators!\n));
+ if ( lp_enable_privileges() ) {
+ if ( !grant_all_privileges( global_sid_Builtin_Administrators
) ) {
+ DEBUG(1,(init_account_policy: Failed to grant
privileges
+ to BUILTIN\\Administrators!\n));
+ }
}
return True;
svn commit: samba r18183 - in branches/SAMBA_4_0/source: build/m4 build/smb_build heimdal_build lib/replace
Author: metze
Date: 2006-09-06 15:28:20 + (Wed, 06 Sep 2006)
New Revision: 18183
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18183
Log:
- add LIBREPLACE globaly and add LIBREPLACE_HOSTCC
- also specify USE_HOSTCC = YES on binaries that use HOSTCC
I also disable autodependecies as this change let make run forever,
I hopefully fix that tomorrow
metze
Modified:
branches/SAMBA_4_0/source/build/m4/check_cc.m4
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/heimdal_build/config.mk
branches/SAMBA_4_0/source/lib/replace/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 15:17:25 UTC
(rev 18182)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-06 15:28:20 UTC
(rev 18183)
@@ -285,6 +285,7 @@
new_make=yes
fi
fi
+new_make=no
AC_MSG_RESULT($new_make)
automatic_dependencies=no
AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [
automatic_dependencies=$new_make ], [])
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-06
15:17:25 UTC (rev 18182)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-06
15:28:20 UTC (rev 18183)
@@ -76,7 +76,9 @@
PUBLIC_HEADERS= list,
CFLAGS= string,
- STANDARD_VISIBILITY = string
+ STANDARD_VISIBILITY = string,
+
+ USE_HOSTCC= bool
},
LIBRARY = {
VERSION = string,
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-06 15:17:25 UTC
(rev 18182)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-09-06 15:28:20 UTC
(rev 18183)
@@ -30,6 +30,25 @@
return split /[ \t\n]/;
}
+sub add_libreplace($)
+{
+ my ($part) = @_;
+
+ return if ($part-{NAME} eq LIBREPLACE);
+ return if ($part-{NAME} eq LIBREPLACE_HOSTCC);
+
+ foreach my $n (@{$part-{PRIVATE_DEPENDENCIES}}) {
+ return if ($n eq LIBREPLACE);
+ return if ($n eq LIBREPLACE_HOSTCC);
+ }
+
+ if (defined($part-{USE_HOSTCC}) $part-{USE_HOSTCC} eq YES) {
+ push (@{$part-{PRIVATE_DEPENDENCIES}}, LIBREPLACE_HOSTCC);
+ } else {
+ push (@{$part-{PRIVATE_DEPENDENCIES}}, LIBREPLACE);
+ }
+}
+
sub check_subsystem($$$)
{
my ($INPUT, $subsys, $default_ot) = @_;
@@ -38,6 +57,7 @@
unless(defined($subsys-{OUTPUT_TYPE})) {
$subsys-{OUTPUT_TYPE} = $default_ot;
}
+ add_libreplace($subsys);
}
sub check_module($$$)
@@ -75,6 +95,7 @@
} else {
push (@{$INPUT-{$mod-{SUBSYSTEM}}{INIT_FUNCTIONS}},
$mod-{INIT_FUNCTION}) if defined($mod-{INIT_FUNCTION});
}
+ add_libreplace($mod);
}
sub check_library($$$)
@@ -100,6 +121,7 @@
}
$lib-{INSTALLDIR} = LIBDIR;
+ add_libreplace($lib);
}
sub check_binary($$)
@@ -111,6 +133,7 @@
($bin-{BINARY} = (lc $bin-{NAME})) if not defined($bin-{BINARY});
$bin-{OUTPUT_TYPE} = BINARY;
+ add_libreplace($bin);
}
sub import_integrated($$)
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-09-06
15:17:25 UTC (rev 18182)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-09-06
15:28:20 UTC (rev 18183)
@@ -117,7 +117,7 @@
}
if (!(abs_path($self-{config}-{srcdir}) eq
abs_path($self-{config}-{builddir}))) {
- $builddir_headers= -I\$(builddir)/include
-I\$(builddir)/lib/replace -I\$(builddir) -I\$(builddir)/lib ;
+ $builddir_headers= -I\$(builddir)/include -I\$(builddir)
-I\$(builddir)/lib ;
}
$self-output( __EOD__
@@ -126,7 +126,7 @@
PERL=$self-{config}-{PERL}
CPP=$self-{config}-{CPP}
-CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir)/lib/replace
-I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H
$self-{config}-{CPPFLAGS}
+CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib
-D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self-{config}-{CPPFLAGS}
CC=$self-{config}-{CC}
CFLAGS=$self-{config}-{CFLAGS} \$(CPPFLAGS)
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
svn commit: samba r18184 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: metze
Date: 2006-09-06 16:33:07 + (Wed, 06 Sep 2006)
New Revision: 18184
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18184
Log:
make clear that autodepencies are disabled currently
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/summary.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/summary.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/summary.pm2006-09-06
15:28:20 UTC (rev 18183)
+++ branches/SAMBA_4_0/source/build/smb_build/summary.pm2006-09-06
16:33:07 UTC (rev 18184)
@@ -53,7 +53,7 @@
print Developer mode:
.(enabled($config-{developer})?yes:no).\n;
print Automatic dependencies: .
(enabled($config-{automatic_dependencies})
- ? yes : no (install GNU make = 3.81)) .
+ ? yes : no (disabled till make doesn't spin)(install GNU
make = 3.81)) .
\n;
print Using shared libraries: .
svn commit: samba r18185 - in branches/SAMBA_3_0/source: . librpc librpc/idl
Author: jerry Date: 2006-09-06 18:04:51 + (Wed, 06 Sep 2006) New Revision: 18185 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18185 Log: add librpc/idl and relevant IDL files from SAMBA_4_0 Added: branches/SAMBA_3_0/source/librpc/ branches/SAMBA_3_0/source/librpc/idl/ branches/SAMBA_3_0/source/librpc/idl/echo.idl branches/SAMBA_3_0/source/librpc/idl/eventlog.idl branches/SAMBA_3_0/source/librpc/idl/initshutdown.idl branches/SAMBA_3_0/source/librpc/idl/lsa.idl branches/SAMBA_3_0/source/librpc/idl/misc.idl branches/SAMBA_3_0/source/librpc/idl/netlogon.idl branches/SAMBA_3_0/source/librpc/idl/ntsvcs.idl branches/SAMBA_3_0/source/librpc/idl/samr.idl branches/SAMBA_3_0/source/librpc/idl/security.idl branches/SAMBA_3_0/source/librpc/idl/spoolss.idl branches/SAMBA_3_0/source/librpc/idl/srvsvc.idl branches/SAMBA_3_0/source/librpc/idl/svcctl.idl branches/SAMBA_3_0/source/librpc/idl/unixinfo.idl branches/SAMBA_3_0/source/librpc/idl/winreg.idl branches/SAMBA_3_0/source/librpc/idl/wkssvc.idl Changeset: Sorry, the patch is too large (8522 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18185
svn commit: samba r18186 - in branches/SAMBA_3_0/source: .
Author: jerry Date: 2006-09-06 18:06:10 + (Wed, 06 Sep 2006) New Revision: 18186 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18186 Log: add svn:externals link to pidl in Samba 4 Modified: branches/SAMBA_3_0/source/ Changeset: Property changes on: branches/SAMBA_3_0/source ___ Name: svn:externals + pidl svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/pidl
svn commit: samba r18187 - in branches/SAMBA_3_0/source/librpc: .
Author: jerry Date: 2006-09-06 18:13:16 + (Wed, 06 Sep 2006) New Revision: 18187 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18187 Log: Replace copy of idl files with a svn:externals link. Will fix the build_idl.sh script to only process the files we are concerned with in this branch. Removed: branches/SAMBA_3_0/source/librpc/idl/ Modified: branches/SAMBA_3_0/source/librpc/ Changeset: Property changes on: branches/SAMBA_3_0/source/librpc ___ Name: svn:externals - + idl svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/librpc/idl
Rev 3739: merge 3.0 upstream changes in file:///home/jelmer/bzr.samba/3.0-libndr/
revno: 3739 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: libndr timestamp: Wed 2006-09-06 20:26:35 +0200 message: merge 3.0 upstream changes added: source/include/ads_protos.h source/script/tests/test_local_s3.sh modified: examples/libsmbclient/Makefile examples/libsmbclient/testacl.c examples/libsmbclient/testread.c source/Makefile.in source/auth/auth_util.c source/client/clitar.c source/include/ads.h source/include/ads_cldap.h source/include/includes.h source/include/libsmb_internal.h source/include/libsmbclient.h source/include/smb.h source/include/talloc.h source/lib/account_pol.c source/lib/events.c source/lib/gencache.c source/lib/smbldap.c source/lib/snprintf.c source/lib/sysacls.c source/lib/talloc.c source/lib/tallocmsg.c source/lib/talloctort.c source/lib/time.c source/lib/util.c source/libaddns/dns.h source/libaddns/dnsrecord.c source/libaddns/dnsupdate.c source/libaddns/dnsutils.c source/libads/ads_struct.c source/libads/cldap.c source/libads/dns.c source/libads/gpo_util.c source/libads/kerberos.c source/libads/kerberos_verify.c source/libads/ldap.c source/libads/ldap_printer.c source/libads/ldap_schema.c source/libads/ldap_user.c source/libads/ldap_utils.c source/libads/sasl.c source/libsmb/clientgen.c source/libsmb/clifile.c source/libsmb/clilist.c source/libsmb/clirap.c source/libsmb/libsmbclient.c source/libsmb/namecache.c source/libsmb/namequery.c source/libsmb/namequery_dc.c source/libsmb/ntlm_check.c source/libsmb/ntlmssp.c source/libsmb/ntlmssp_sign.c source/libsmb/smbdes.c source/locking/brlock.c source/locking/locking.c source/nsswitch/pam_winbind.c source/nsswitch/winbindd.c source/nsswitch/winbindd_ads.c source/nsswitch/winbindd_async.c source/nsswitch/winbindd_cache.c source/nsswitch/winbindd_ccache_access.c source/nsswitch/winbindd_cm.c source/nsswitch/winbindd_cred_cache.c source/nsswitch/winbindd_nss.h source/nsswitch/winbindd_pam.c source/passdb/lookup_sid.c source/passdb/passdb.c source/printing/nt_printing.c source/printing/print_iprint.c source/rpc_parse/parse_dfs.c source/rpc_parse/parse_prs.c source/script/tests/selftest.sh source/script/tests/test_functions.sh source/script/tests/test_smbclient_s3.sh source/script/tests/test_smbtorture_s3.sh source/script/tests/tests_all.sh source/smbd/oplock_linux.c source/smbd/sesssetup.c source/tdb/common/transaction.c source/torture/torture.c source/utils/net_ads.c source/utils/net_ads_gpo.c source/utils/net_dns.c source/utils/net_lookup.c source/utils/net_usershare.c source/utils/netlookup.c source/utils/ntlm_auth.c source/utils/ntlm_auth_diagnostics.c merged: svn-v1:[EMAIL PROTECTED] committer: jerry timestamp: Wed 2006-09-06 15:17:25 + message: only grant privs to Administrators if privileges are enabled to avoid bopgus error messages merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 13:20:06 + message: Some build- and memleak-fixes for the (not build by default) ADS GPO routines. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 13:13:12 + message: Forgot to call asn1_free() in previous commit. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 13:10:20 + message: Do not return success when we failed to write in the CLDAP code. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 12:34:00 + message: Just a little more verbosity in this debug statement. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 12:29:45 + message: Make sure to actually get the printing data before trying to publish it in AD. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 12:21:13 + message: Adding DEBUG() to winbinds refresh seqnum to track down a failure. Guenther merged: svn-v1:[EMAIL PROTECTED] committer: gd timestamp: Wed 2006-09-06 12:14:58 + message: Fix memleaks. Guenther
Rev 3740: Merge more upstream changes in file:///home/jelmer/bzr.samba/3.0-libndr/
revno: 3740 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: libndr timestamp: Wed 2006-09-06 20:27:54 +0200 message: Merge more upstream changes added: source/librpc/ merged: svn-v1:[EMAIL PROTECTED] committer: jerry timestamp: Wed 2006-09-06 18:13:16 + message: Replace copy of idl files with a svn:externals link. Will fix the build_idl.sh script to only process the files we are concerned with in this branch. merged: svn-v1:[EMAIL PROTECTED] committer: jerry timestamp: Wed 2006-09-06 18:06:10 + message: add svn:externals link to pidl in Samba 4 merged: svn-v1:[EMAIL PROTECTED] committer: jerry timestamp: Wed 2006-09-06 18:04:51 + message: add librpc/idl and relevant IDL files from SAMBA_4_0
svn commit: samba r18188 - in branches/SAMBA_3_0: . source source/include source/lib source/libads source/libmsrpc source/libndr source/nsswitch source/rpc_client source/rpc_parse source/rpc_server so
Author: jelmer Date: 2006-09-06 18:32:20 + (Wed, 06 Sep 2006) New Revision: 18188 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18188 Log: merge 3.0-libndr branch Added: branches/SAMBA_3_0/source/TODO branches/SAMBA_3_0/source/libndr/ndr_unixinfo.c branches/SAMBA_3_0/source/libndr/ndr_unixinfo.h branches/SAMBA_3_0/source/libndr/unixinfo.h branches/SAMBA_3_0/source/rpc_client/cli_unixinfo.h Modified: branches/SAMBA_3_0/ branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/rpc_netlogon.h branches/SAMBA_3_0/source/include/rpc_perfcount.h branches/SAMBA_3_0/source/include/rpc_samr.h branches/SAMBA_3_0/source/include/rpc_spoolss.h branches/SAMBA_3_0/source/include/rpc_unixinfo.h branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/lib/time.c branches/SAMBA_3_0/source/libads/authdata.c branches/SAMBA_3_0/source/libmsrpc/libmsrpc.c branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c branches/SAMBA_3_0/source/libndr/ndr_basic.c branches/SAMBA_3_0/source/libndr/security.h branches/SAMBA_3_0/source/libndr/sid.c branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0/source/rpc_client/cli_reg.c branches/SAMBA_3_0/source/rpc_client/cli_unixinfo.c branches/SAMBA_3_0/source/rpc_parse/parse_misc.c branches/SAMBA_3_0/source/rpc_parse/parse_net.c branches/SAMBA_3_0/source/rpc_parse/parse_samr.c branches/SAMBA_3_0/source/rpc_parse/parse_spoolss.c branches/SAMBA_3_0/source/rpc_parse/parse_unixinfo.c branches/SAMBA_3_0/source/rpc_server/srv_samr_util.c branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0/source/rpc_server/srv_unixinfo_nt.c branches/SAMBA_3_0/source/rpcclient/cmd_lsarpc.c branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c branches/SAMBA_3_0/source/rpcclient/cmd_samr.c branches/SAMBA_3_0/source/rpcclient/cmd_unixinfo.c branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh branches/SAMBA_3_0/source/torture/msgtest.c branches/SAMBA_3_0/source/utils/net_rpc.c branches/SAMBA_3_0/source/utils/net_rpc_samsync.c Changeset: Sorry, the patch is too large (4700 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18188
svn commit: samba r18189 - in branches/SAMBA_3_0/source/nsswitch: .
Author: jra
Date: 2006-09-06 19:02:39 + (Wed, 06 Sep 2006)
New Revision: 18189
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18189
Log:
When tearing down a connection we can be harsher
with timeouts. Also, wait for 5 seconds not 10
on connecting to a DC.
Jeremy.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-06 18:32:20 UTC
(rev 18188)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-06 19:02:39 UTC
(rev 18189)
@@ -757,7 +757,8 @@
if ((addrs == NULL) || (dcnames == NULL))
return False;
- if ( !open_any_socket_out(addrs, num_addrs, 1, fd_index, fd) )
+ /* 5 second timeout. */
+ if ( !open_any_socket_out(addrs, num_addrs, 5000, fd_index, fd) )
{
for (i=0; inum_dcs; i++) {
add_failed_connection_entry(domain-name,
@@ -847,7 +848,8 @@
add_sockaddr_to_array(mem_ctx, domain-dcaddr.sin_addr,
445, addrs, num_addrs);
add_sockaddr_to_array(mem_ctx, domain-dcaddr.sin_addr,
139, addrs, num_addrs);
- if (!open_any_socket_out(addrs, num_addrs, 1,
dummy, fd)) {
+ /* 5 second timeout. */
+ if (!open_any_socket_out(addrs, num_addrs, 5000,
dummy, fd)) {
domain-online = False;
fd = -1;
}
@@ -890,18 +892,40 @@
void invalidate_cm_connection(struct winbindd_cm_conn *conn)
{
+ /* We're closing down a possibly dead
+ connection. Don't have impossibly long (10s) timeouts. */
+
+ if (conn-cli) {
+ cli_set_timeout(conn-cli, 1000); /* 1 second. */
+ }
+
if (conn-samr_pipe != NULL) {
- cli_rpc_pipe_close(conn-samr_pipe);
+ if (!cli_rpc_pipe_close(conn-samr_pipe)) {
+ /* Ok, it must be dead. Drop timeout to 0.5 sec. */
+ if (conn-cli) {
+ cli_set_timeout(conn-cli, 500);
+ }
+ }
conn-samr_pipe = NULL;
}
if (conn-lsa_pipe != NULL) {
- cli_rpc_pipe_close(conn-lsa_pipe);
+ if (!cli_rpc_pipe_close(conn-lsa_pipe)) {
+ /* Ok, it must be dead. Drop timeout to 0.5 sec. */
+ if (conn-cli) {
+ cli_set_timeout(conn-cli, 500);
+ }
+ }
conn-lsa_pipe = NULL;
}
if (conn-netlogon_pipe != NULL) {
- cli_rpc_pipe_close(conn-netlogon_pipe);
+ if (!cli_rpc_pipe_close(conn-netlogon_pipe)) {
+ /* Ok, it must be dead. Drop timeout to 0.5 sec. */
+ if (conn-cli) {
+ cli_set_timeout(conn-cli, 500);
+ }
+ }
conn-netlogon_pipe = NULL;
}
svn commit: samba r18190 - in branches/SAMBA_4_0/source/script/tests: .
Author: mimir Date: 2006-09-06 19:43:39 + (Wed, 06 Sep 2006) New Revision: 18190 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18190 Log: Add more NET tests to be run on the build farm. rafal Modified: branches/SAMBA_4_0/source/script/tests/test_net.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_net.sh === --- branches/SAMBA_4_0/source/script/tests/test_net.sh 2006-09-06 19:02:39 UTC (rev 18189) +++ branches/SAMBA_4_0/source/script/tests/test_net.sh 2006-09-06 19:43:39 UTC (rev 18190) @@ -2,9 +2,9 @@ # add tests to this list as they start passing, so we test # that they stay passing -ncacn_np_tests=NET-API-RPCCONN-BIND NET-API-RPCCONN-SRV NET-API-RPCCONN-DC NET-API-RPCCONN-DCINFO NET-API-LISTSHARES NET-API-CREATEUSER NET-API-DELETEUSER +ncacn_np_tests=NET-API-LOOKUP NET-API-LOOKUPHOST NET-API-LOOKUPPDC NET-API-RPCCONN-BIND NET-API-RPCCONN-SRV NET-API-RPCCONN-DC NET-API-RPCCONN-DCINFO NET-API-LISTSHARES NET-API-CREATEUSER NET-API-DELETEUSER ncalrpc_tests=NET-API-RPCCONN-SRV NET-API-RPCCONN-DC NET-API-RPCCONN-DCINFO NET-API-LISTSHARES NET-API-CREATEUSER NET-API-DELETEUSER -ncacn_ip_tcp_tests=NET-API-RPCCONN-SRV NET-API-RPCCONN-DC NET-API-RPCCONN-DCINFO NET-API-LISTSHARES NET-API-CREATEUSER NET-API-DELETEUSER +ncacn_ip_tcp_tests=NET-API-LOOKUP NET-API-LOOKUPHOST NET-API-LOOKUPPDC NET-API-RPCCONN-SRV NET-API-RPCCONN-DC NET-API-RPCCONN-DCINFO NET-API-LISTSHARES NET-API-CREATEUSER NET-API-DELETEUSER if [ $# -lt 4 ]; then cat EOF
Rev 9131: Modify talloc testsuite to optionally use the torture ui in file:///home/jelmer/bzr.samba/4.0-unittest/
revno: 9131 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: unittest timestamp: Wed 2006-09-06 22:10:01 +0200 message: Modify talloc testsuite to optionally use the torture ui modified: source/lib/crypto/sha1test.c source/lib/talloc/testsuite.c source/torture/local/local.c source/torture/smbtorture.c source/torture/ui.h
Rev 9132: Fix order of tests, talloc on NULL in file:///home/jelmer/bzr.samba/4.0-unittest/
revno: 9132 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: unittest timestamp: Wed 2006-09-06 22:23:56 +0200 message: Fix order of tests, talloc on NULL modified: source/auth/gensec/cyrus_sasl.c source/torture/smbtorture.c source/torture/torture.c
Rev 9133: Convert first RPC testcase. in file:///home/jelmer/bzr.samba/4.0-unittest/
revno: 9133 committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: unittest timestamp: Wed 2006-09-06 23:19:09 +0200 message: Convert first RPC testcase. modified: source/torture/rpc/echo.c source/torture/rpc/rpc.c source/torture/rpc/rpc.h
svn commit: samba r18191 - in branches/SAMBA_3_0/source: lib nsswitch
Author: jra
Date: 2006-09-06 21:43:31 + (Wed, 06 Sep 2006)
New Revision: 18191
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18191
Log:
Fix the online/offline state handling of winbindd.
Instead of trying to do this in the winbindd_cache
entries, add a timed even handler to probe every
5 mins when disconnected.
Fix events to run all pending events, rather than
only one.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/events.c
branches/SAMBA_3_0/source/nsswitch/winbindd.h
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/events.c
===
--- branches/SAMBA_3_0/source/lib/events.c 2006-09-06 19:43:39 UTC (rev
18190)
+++ branches/SAMBA_3_0/source/lib/events.c 2006-09-06 21:43:31 UTC (rev
18191)
@@ -79,27 +79,24 @@
void run_events(void)
{
- struct timeval now;
+ /* Run all events that are pending, not just one (as we
+ did previously. */
- if (timed_events == NULL) {
- /* No syscall if there are no events */
- DEBUG(11, (run_events: No events\n));
- return;
- }
+ while (timed_events) {
+ struct timeval now;
+ GetTimeOfDay(now);
- GetTimeOfDay(now);
+ if (timeval_compare(now, timed_events-when) 0) {
+ /* Nothing to do yet */
+ DEBUG(11, (run_events: Nothing to do\n));
+ return;
+ }
- if (timeval_compare(now, timed_events-when) 0) {
- /* Nothing to do yet */
- DEBUG(11, (run_events: Nothing to do\n));
- return;
- }
+ DEBUG(10, (Running event \%s\ %lx\n,
timed_events-event_name,
+ (unsigned long)timed_events));
- DEBUG(10, (Running event \%s\ %lx\n, timed_events-event_name,
- (unsigned long)timed_events));
-
- timed_events-handler(timed_events, now, timed_events-private_data);
- return;
+ timed_events-handler(timed_events, now,
timed_events-private_data);
+ }
}
struct timeval *get_timed_events_timeout(struct timeval *to_ret)
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.h
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd.h 2006-09-06 19:43:39 UTC
(rev 18190)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.h 2006-09-06 21:43:31 UTC
(rev 18191)
@@ -199,6 +199,10 @@
struct winbindd_child child;
+ /* Callback we use to try put us back online. */
+
+ struct timed_event *check_online_event;
+
/* Linked list info */
struct winbindd_domain *prev, *next;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-09-06 19:43:39 UTC
(rev 18190)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-09-06 21:43:31 UTC
(rev 18191)
@@ -473,12 +473,10 @@
return False;
}
- /* when the domain is offline and we havent checked in the last 30
-* seconds if it has become online again, return the cached entry.
+ /* when the domain is offline return the cached entry.
* This deals with transient offline states... */
- if (!domain-online
- !NT_STATUS_IS_OK(check_negative_conn_cache(domain-name,
domain-dcname))) {
+ if (!domain-online) {
DEBUG(10,(centry_expired: Key %s for domain %s valid as domain
is offline.\n,
keystr, domain-name ));
return False;
@@ -2552,7 +2550,7 @@
tdb_delete_bystring(wcache-tdb, WINBINDD_OFFLINE);
}
-BOOL get_global_winbindd_state_online(void)
+BOOL get_global_winbindd_state_offline(void)
{
return global_winbindd_offline_state;
}
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-06 19:43:39 UTC
(rev 18190)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-06 21:43:31 UTC
(rev 18191)
@@ -64,7 +64,114 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
+static NTSTATUS init_dc_connection(struct winbindd_domain *domain);
+/
+ Handler triggered if we're offline to try and detect a DC.
+/
+
+static void check_domain_online_handler(struct timed_event *te,
+ const struct timeval
svn commit: samba r18194 - in branches/SAMBA_4_0/source/pidl: . lib/Parse/Pidl
Author: jelmer
Date: 2006-09-06 22:25:54 + (Wed, 06 Sep 2006)
New Revision: 18194
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18194
Log:
Allow empty bitmap {} declarations.
Modified:
branches/SAMBA_4_0/source/pidl/idl.yp
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm
Changeset:
Sorry, the patch is too large (1885 lines) to include; please use WebSVN to see
it!
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18194
svn commit: samba r18195 - in branches/SAMBA_3_0/source/librpc/gen_ndr: .
Author: jerry Date: 2006-09-06 22:29:40 + (Wed, 06 Sep 2006) New Revision: 18195 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18195 Log: remove hardcoded path introdiced by pidl Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h Changeset: Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h === --- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h 2006-09-06 22:25:54 UTC (rev 18194) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h 2006-09-06 22:29:40 UTC (rev 18195) @@ -1,6 +1,6 @@ /* header auto-generated by pidl */ -#include /home/drizzt/jerry/bzr/samba/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h +#include gen_ndr/unixinfo.h #ifndef _HEADER_NDR_unixinfo #define _HEADER_NDR_unixinfo
Build status as of Thu Sep 7 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-09-06 00:00:27.0 + +++ /home/build/master/cache/broken_results.txt 2006-09-07 00:00:18.0 + @@ -1,20 +1,21 @@ -Build status as of Wed Sep 6 00:00:01 2006 +Build status as of Thu Sep 7 00:00:02 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 -ccache 39 9 0 -distcc 39 7 0 -ldb 35 30 0 -libreplace 33 1 0 -lorikeet-heimdal 0 0 0 -ppp 17 0 0 -rsync37 4 0 +build_farm 0 0 0 +ccache 42 9 0 +distcc 42 7 0 +ldb 37 8 0 +libreplace 35 1 0 +lorikeet-heimdal 2 0 0 +ppp 18 0 0 +rsync40 5 0 samba0 0 0 samba-docs 0 0 0 -samba4 41 41 0 -samba_3_040 9 0 -smb-build28 3 0 -talloc 39 1 0 -tdb 36 5 0 +samba4 43 27 2 +samba_3_042 35 17 +smb-build30 3 0 +talloc 41 4 0 +tdb 38 5 0
svn commit: samba r18196 - in branches/SAMBA_3_0/source/nsswitch: .
Author: jra
Date: 2006-09-07 01:07:43 + (Thu, 07 Sep 2006)
New Revision: 18196
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18196
Log:
Fix debug message (this should be online not offline).
Jeremy.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-06 22:29:40 UTC
(rev 18195)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-07 01:07:43 UTC
(rev 18196)
@@ -146,7 +146,7 @@
void set_domain_online(struct winbindd_domain *domain)
{
- DEBUG(10,(set_domain_offline: called for domain %s\n,
+ DEBUG(10,(set_domain_online: called for domain %s\n,
domain-name ));
if (get_global_winbindd_state_offline()) {
svn commit: samba r18197 - in branches/SAMBA_3_0/source/librpc/gen_ndr: .
Author: jerry Date: 2006-09-07 02:15:31 + (Thu, 07 Sep 2006) New Revision: 18197 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18197 Log: compile fixes Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c Changeset: Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c === --- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-09-07 01:07:43 UTC (rev 18196) +++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-09-07 02:15:31 UTC (rev 18197) @@ -4,10 +4,8 @@ #define _GNU_SOURCE #endif -#include stdint.h #include stdlib.h #include stdio.h -#include stdbool.h #include stdarg.h #include string.h #include core/nterr.h
svn commit: samba r18198 - in branches/SAMBA_4_0/source/auth/gensec: .
Author: abartlet
Date: 2006-09-07 03:24:08 + (Thu, 07 Sep 2006)
New Revision: 18198
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18198
Log:
Fix callbacks to use allocated or constant memory, not the stack.
These values are used by SASL at a later time, and must remain valid.
Make the password callback actually return the password.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c
===
--- branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-07 02:15:31 UTC
(rev 18197)
+++ branches/SAMBA_4_0/source/auth/gensec/cyrus_sasl.c 2006-09-07 03:24:08 UTC
(rev 18198)
@@ -101,6 +101,7 @@
}
secret-len = strlen(password);
safe_strcpy(secret-data, password, secret-len+1);
+ *psecret = secret;
return SASL_OK;
}
@@ -119,9 +120,16 @@
struct socket_address *remote_socket_addr =
gensec_get_peer_addr(gensec_security);
char *local_addr = NULL;
char *remote_addr = NULL;
- sasl_callback_t callbacks[5];
int sasl_ret;
+ sasl_callback_t *callbacks;
+
+ gensec_sasl_state = talloc(gensec_security, struct gensec_sasl_state);
+ if (!gensec_sasl_state) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ callbacks = talloc_array(gensec_sasl_state, sasl_callback_t, 5);
callbacks[0].id = SASL_CB_USER;
callbacks[0].proc = gensec_sasl_get_user;
callbacks[0].context = gensec_security;
@@ -142,11 +150,6 @@
callbacks[4].proc = NULL;
callbacks[4].context = NULL;
- gensec_sasl_state = talloc(gensec_security, struct gensec_sasl_state);
- if (!gensec_sasl_state) {
- return NT_STATUS_NO_MEMORY;
- }
-
gensec_security-private_data = gensec_sasl_state;
if (local_socket_addr) {
@@ -342,7 +345,7 @@
debug_level = 0;
break;
}
- DEBUG(debug_level, (gensec_sasl: %s, message));
+ DEBUG(debug_level, (gensec_sasl: %s\n, message));
return SASL_OK;
}
@@ -351,17 +354,20 @@
{
NTSTATUS ret;
int sasl_ret, i;
- sasl_callback_t callbacks[2];
const char **sasl_mechs;
- callbacks[0].id = SASL_CB_LOG;
- callbacks[0].proc = gensec_sasl_log;
- callbacks[0].context = NULL;
-
- callbacks[1].id = SASL_CB_LIST_END;
- callbacks[1].proc = gensec_sasl_log;
- callbacks[1].context = NULL;
-
+ static const sasl_callback_t callbacks[] = {
+ {
+ .id = SASL_CB_LOG,
+ .proc = gensec_sasl_log,
+ .context = NULL,
+ },
+ {
+ .id = SASL_CB_LIST_END,
+ .proc = gensec_sasl_log,
+ .context = NULL,
+ }
+ };
sasl_ret = sasl_client_init(callbacks);
if (sasl_ret == SASL_NOMECH) {
svn commit: samba r18199 - in branches/SAMBA_3_0/source: libsmb nsswitch
Author: jra
Date: 2006-09-07 03:44:05 + (Thu, 07 Sep 2006)
New Revision: 18199
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18199
Log:
Allow winbindd to delete a saf_ entry if it knows
it can't talk to it.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libsmb/namequery.c
branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/namequery.c
===
--- branches/SAMBA_3_0/source/libsmb/namequery.c2006-09-07 03:24:08 UTC
(rev 18198)
+++ branches/SAMBA_3_0/source/libsmb/namequery.c2006-09-07 03:44:05 UTC
(rev 18199)
@@ -77,6 +77,30 @@
return ret;
}
+BOOL saf_delete( const char *domain, const char *servername )
+{
+ char *key;
+ BOOL ret = False;
+
+ if ( !domain || !servername ) {
+ DEBUG(2,(saf_delete: Refusing to store empty domain or
servername!\n));
+ return False;
+ }
+
+ if ( !gencache_init() )
+ return False;
+
+ key = saf_key(domain);
+ ret = gencache_del(key);
+
+ if (ret) {
+ DEBUG(10,(saf_delete: domain = [%s], server = [%s]\n,
+ domain, servername));
+ }
+ SAFE_FREE( key );
+ return ret;
+}
+
/
/
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-07 03:24:08 UTC
(rev 18198)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c2006-09-07 03:44:05 UTC
(rev 18199)
@@ -167,8 +167,12 @@
NTSTATUS result)
{
add_failed_connection_entry(domain-name, server, result);
+ /* If this was the saf name for the last thing we talked to,
+ remove it. */
+ saf_delete(domain-name, server);
if (*domain-alt_name) {
add_failed_connection_entry(domain-alt_name, server, result);
+ saf_delete(domain-alt_name, server);
}
}
svn commit: samba r18200 - in branches/SAMBA_3_0/source/libads: .
Author: jra
Date: 2006-09-07 04:01:11 + (Thu, 07 Sep 2006)
New Revision: 18200
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18200
Log:
Experimental code to allow system /etc/krb5.conf to be
overwritten by winbindd. Don't enable this :-).
Jeremy.
Modified:
branches/SAMBA_3_0/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2006-09-07 03:44:05 UTC (rev
18199)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2006-09-07 04:01:11 UTC (rev
18200)
@@ -516,15 +516,15 @@
BOOL create_local_private_krb5_conf_for_domain(const char *realm, const char
*domain, struct in_addr ip)
{
- XFILE *xfp = NULL;
char *dname = talloc_asprintf(NULL, %s/smb_krb5, lp_lockdir());
+ char *tmpname = NULL;
char *fname = NULL;
char *file_contents = NULL;
char *kdc_ip_string;
size_t flen = 0;
- size_t ret;
+ ssize_t ret;
+ int fd;
char *realm_upper = NULL;
- int loopcount = 0;
if (!dname) {
return False;
@@ -537,6 +537,12 @@
return False;
}
+ tmpname = talloc_asprintf(dname, %s/smb_tmp_krb5.XX,
lp_lockdir());
+ if (!tmpname) {
+ TALLOC_FREE(dname);
+ return False;
+ }
+
fname = talloc_asprintf(dname, %s/krb5.conf.%s, dname, domain);
if (!fname) {
TALLOC_FREE(dname);
@@ -567,62 +573,77 @@
flen = strlen(file_contents);
- while (loopcount 10) {
- SMB_STRUCT_STAT st;
-
- xfp = x_fopen(fname, O_CREAT|O_WRONLY, 0644);
- if (!xfp) {
- TALLOC_FREE(dname);
- return False;
- }
- /* Lock the file. */
- if (!fcntl_lock(xfp-fd, F_SETLKW, 0, 1, F_WRLCK)) {
- unlink(fname);
- x_fclose(xfp);
- TALLOC_FREE(dname);
- return False;
- }
-
- /* We got the lock. Is the file still there ? */
- if (sys_stat(fname,st)==-1) {
- if (errno == ENOENT) {
- /* Nope - try again up to 10x */
- x_fclose(xfp);
- loopcount++;
- continue;
- }
- unlink(fname);
- x_fclose(xfp);
- TALLOC_FREE(dname);
- return False;
- }
- break;
+ fd = smb_mkstemp(tmpname);
+ if (fd == -1) {
+ DEBUG(0,(create_local_private_krb5_conf_for_domain:
smb_mkstemp failed,
+for file %s. Errno %s\n,
+ tmpname, strerror(errno) ));
}
- ret = x_fwrite(file_contents, 1, flen, xfp);
+ ret = write(fd, file_contents, flen);
if (flen != ret) {
- DEBUG(0,(create_local_private_krb5_conf_for_domain: x_fwrite
failed,
-returned %u (should be %u). Errno %s\n,
- (unsigned int)ret, (unsigned int)flen, strerror(errno)
));
- unlink(fname);
- x_fclose(xfp);
+ DEBUG(0,(create_local_private_krb5_conf_for_domain: write
failed,
+returned %d (should be %u). Errno %s\n,
+ (int)ret, (unsigned int)flen, strerror(errno) ));
+ unlink(tmpname);
+ close(fd);
TALLOC_FREE(dname);
return False;
}
- if (x_fclose(xfp)==-1) {
- DEBUG(0,(create_local_private_krb5_conf_for_domain: x_fclose
failed.
+ if (close(fd)==-1) {
+ DEBUG(0,(create_local_private_krb5_conf_for_domain: close
failed.
Errno %s\n, strerror(errno) ));
- unlink(fname);
+ unlink(tmpname);
TALLOC_FREE(dname);
return False;
}
+ if (rename(tmpname, fname) == -1) {
+ DEBUG(0,(create_local_private_krb5_conf_for_domain: rename
+ of %s to %s failed. Errno %s\n,
+ tmpname, fname, strerror(errno) ));
+ unlink(tmpname);
+ TALLOC_FREE(dname);
+ return False;
+ }
+
DEBUG(5,(create_local_private_krb5_conf_for_domain: wrote
file %s with realm %s KDC = %s\n,
fname, realm_upper, inet_ntoa(ip) ));
/* Set the environment variable to this file. */
setenv(KRB5_CONFIG, fname, 1);
+
+#if defined(OVERWRITE_SYSTEM_KRB5_CONF)
+
+ /* Insanity, sheer insanity. */
+
+ if (symlink(fname, /etc/krb5.conf)
svn commit: samba r18201 - in branches/SAMBA_3_0/source/libads: .
Author: jra
Date: 2006-09-07 04:17:23 + (Thu, 07 Sep 2006)
New Revision: 18201
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18201
Log:
Make explicit what's going on here.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libads/kerberos.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2006-09-07 04:01:11 UTC (rev
18200)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2006-09-07 04:17:23 UTC (rev
18201)
@@ -520,7 +520,7 @@
char *tmpname = NULL;
char *fname = NULL;
char *file_contents = NULL;
- char *kdc_ip_string;
+ char *kdc_ip_string = NULL;
size_t flen = 0;
ssize_t ret;
int fd;
@@ -627,6 +627,7 @@
return True; /* Not a fatal error. */
}
+ /* Yes, this is a race conditon... too bad. */
if (unlink(/etc/krb5.conf) == -1) {
DEBUG(0,(create_local_private_krb5_conf_for_domain:
unlink
of /etc/krb5.conf failed. Errno %s\n,
svn commit: samba r18202 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: tridge
Date: 2006-09-07 04:24:54 + (Thu, 07 Sep 2006)
New Revision: 18202
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18202
Log:
moved the overrides for HAVE_xxx from heimdal_build/config.h to
heimdal_build/roken.h
This is a workaround for the fact that with the current CFLAGS and
dependencies system, -Iheimdal_build is put at the front of the
includes list, which means it overrides the normal config.h
Modified:
branches/SAMBA_4_0/source/heimdal_build/config.h
branches/SAMBA_4_0/source/heimdal_build/roken.h
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===
--- branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-07 04:17:23 UTC
(rev 18201)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-07 04:24:54 UTC
(rev 18202)
@@ -29,9 +29,6 @@
#define VERSIONLIST {Lorikeet-Heimdal, Modified for Samba4 0.7rc1}
-/* even if we do have dlopen, we don't want heimdal using it */
-#undef HAVE_DLOPEN
-
#define VERSION Samba
#define ROKEN_LIB_FUNCTION
@@ -39,29 +36,9 @@
/* these should be done with configure tests */
#define KRB5
-/* we need to tell roken about the functions that Samba replaces in
lib/replace */
-#ifndef HAVE_SETEUID
-#define HAVE_SETEUID 1
-#endif
-
#define GETHOSTBYADDR_PROTO_COMPATIBLE
#define GETSERVBYNAME_PROTO_COMPATIBLE
#define OPENLOG_PROTO_COMPATIBLE
#define GETSOCKNAME_PROTO_COMPATIBLE
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
#endif
-
-#ifndef HAVE_STRNDUP
-#define HAVE_STRNDUP
-#endif
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
-#endif
-
-#ifndef HAVE_SSIZE_T
-#define HAVE_SSIZE_T
-#endif
-
-#endif
Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h
===
--- branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:17:23 UTC
(rev 18201)
+++ branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:24:54 UTC
(rev 18202)
@@ -4,5 +4,31 @@
#ifndef _ROKEN_H_
#define _ROKEN_H_
#include heimdal_build/config.h
+
+/* even if we do have dlopen, we don't want heimdal using it */
+#undef HAVE_DLOPEN
+
+/* we need to tell roken about the functions that Samba replaces in
lib/replace */
+#ifndef HAVE_SETEUID
+#define HAVE_SETEUID 1
+#endif
+
+#ifndef HAVE_SOCKLEN_T
+#define HAVE_SOCKLEN_T
+#endif
+
+#ifndef HAVE_STRNDUP
+#define HAVE_STRNDUP
+#endif
+#ifndef HAVE_SOCKLEN_T
+#define HAVE_SOCKLEN_T
+#endif
+
+#ifndef HAVE_SSIZE_T
+#define HAVE_SSIZE_T
+#endif
+
+
+
#include heimdal/lib/roken/roken.h
#endif
svn commit: samba r18203 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: tridge
Date: 2006-09-07 04:52:06 + (Thu, 07 Sep 2006)
New Revision: 18203
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=18203
Log:
rearranged the overrides in heimdal_build/*.h to avoid the use of
heimdal_build/config.h from interfering with libreplace
This is a workaround for the fact that with the current CFLAGS and
dependencies system, -Iheimdal_build is put at the front of the
includes list, which means it overrides the normal config.h
Modified:
branches/SAMBA_4_0/source/heimdal_build/config.h
branches/SAMBA_4_0/source/heimdal_build/krb5-types.h
branches/SAMBA_4_0/source/heimdal_build/roken.h
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===
--- branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-07 04:24:54 UTC
(rev 18202)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h2006-09-07 04:52:06 UTC
(rev 18203)
@@ -4,41 +4,12 @@
*/
#ifndef HAVE_HEIMDAL_CONFIG_H
-#define HAVE_HEIMDAL_CONFIG_H 1
+#define HAVE_HEIMDAL_CONFIG_H
-#include include/config.h
-#include replace.h
-
#define RCSID(msg)
-
-#ifdef VOID_RETSIGTYPE
-#define SIGRETURN(x) return
-#else
-#define SIGRETURN(x) return (RETSIGTYPE)(x)
-#endif
-
-/* path to sysconf - should we force this to samba LIBDIR ? */
-#define SYSCONFDIR /etc
-
-/* HDB module dir - set to Samba LIBDIR/hdb ? */
-#define HDBDIR /usr/heimdal/lib
-
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
-
-#define VERSIONLIST {Lorikeet-Heimdal, Modified for Samba4 0.7rc1}
-
-#define VERSION Samba
-
-#define ROKEN_LIB_FUNCTION
-
-/* these should be done with configure tests */
#define KRB5
-#define GETHOSTBYADDR_PROTO_COMPATIBLE
-#define GETSERVBYNAME_PROTO_COMPATIBLE
-#define OPENLOG_PROTO_COMPATIBLE
-#define GETSOCKNAME_PROTO_COMPATIBLE
+#include include/config.h
+#include replace.h
#endif
Modified: branches/SAMBA_4_0/source/heimdal_build/krb5-types.h
===
--- branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2006-09-07
04:24:54 UTC (rev 18202)
+++ branches/SAMBA_4_0/source/heimdal_build/krb5-types.h2006-09-07
04:52:06 UTC (rev 18203)
@@ -3,19 +3,9 @@
#ifndef __krb5_types_h__
#define __krb5_types_h__
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-#if HAVE_INTTYPES_H
-#include inttypes.h
-#endif
-#if HAVE_SYS_TYPES_H
-#include sys/types.h
-#endif
-#if HAVE_SYS_BITYPES_H
-#include sys/bitypes.h
-#endif
+#include replace.h
+
#ifdef HAVE_SYS_SOCKET_H
#include sys/socket.h
#endif
@@ -24,4 +14,10 @@
typedef socklen_t krb5_socklen_t;
typedef ssize_t krb5_ssize_t;
+#ifdef VOID_RETSIGTYPE
+#define SIGRETURN(x) return
+#else
+#define SIGRETURN(x) return (RETSIGTYPE)(x)
+#endif
+
#endif /* __krb5_types_h__ */
Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h
===
--- branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:24:54 UTC
(rev 18202)
+++ branches/SAMBA_4_0/source/heimdal_build/roken.h 2006-09-07 04:52:06 UTC
(rev 18203)
@@ -1,10 +1,30 @@
/*
- a wrapper to avoid double inclusion of the real roken.h
+ a wrapper to override some of the defines that the heimdal roken system
looks at
*/
#ifndef _ROKEN_H_
#define _ROKEN_H_
-#include heimdal_build/config.h
+/* path to sysconf - should we force this to samba LIBDIR ? */
+#define SYSCONFDIR /etc
+
+/* HDB module dir - set to Samba LIBDIR/hdb ? */
+#define HDBDIR /usr/heimdal/lib
+
+/* Maximum values on all known systems */
+#define MaxHostNameLen (64+4)
+#define MaxPathLen (1024+4)
+
+#define VERSIONLIST {Lorikeet-Heimdal, Modified for Samba4 0.7rc1}
+
+#define VERSION Samba
+
+#define ROKEN_LIB_FUNCTION
+
+#define GETHOSTBYADDR_PROTO_COMPATIBLE
+#define GETSERVBYNAME_PROTO_COMPATIBLE
+#define OPENLOG_PROTO_COMPATIBLE
+#define GETSOCKNAME_PROTO_COMPATIBLE
+
/* even if we do have dlopen, we don't want heimdal using it */
#undef HAVE_DLOPEN
@@ -28,7 +48,5 @@
#define HAVE_SSIZE_T
#endif
-
-
#include heimdal/lib/roken/roken.h
#endif
