date:20060425

svn commit: samba r15225 - in branches/SAMBA_4_0/source/libcli: .

2006-04-25 Thread abartlet

Author: abartlet
Date: 2006-04-25 06:53:28 + (Tue, 25 Apr 2006)
New Revision: 15225

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

Log:
Use talloc_zero() to avoid use of uninitialised values later on.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/finddcs.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/finddcs.c
===
--- branches/SAMBA_4_0/source/libcli/finddcs.c  2006-04-24 22:50:19 UTC (rev 
15224)
+++ branches/SAMBA_4_0/source/libcli/finddcs.c  2006-04-25 06:53:28 UTC (rev 
15225)
@@ -70,7 +70,7 @@
struct finddcs_state *state;
struct nbt_name name;
 
-   result = talloc(mem_ctx, struct composite_context);
+   result = talloc_zero(mem_ctx, struct composite_context);
if (result == NULL) goto failed;
result-state = COMPOSITE_STATE_IN_PROGRESS;
result-async.fn = NULL;

svn commit: samba r15226 - in branches/SAMBA_4_0/source/lib/replace: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 07:56:31 + (Tue, 25 Apr 2006)
New Revision: 15226

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

Log:
Fix order of typedef specification - caught by kblin

Modified:
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-04-25 06:53:28 UTC 
(rev 15225)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-04-25 07:56:31 UTC 
(rev 15226)
@@ -206,7 +206,7 @@
 
 #ifndef HAVE_BOOL
 #define __bool_true_false_are_defined
-typedef bool int;
+typedef int bool;
 #define false (0)
 #define true (1)
 #endif

svn commit: samba r15227 - branches/SAMBA_3_0/source/libsmb trunk/source/libsmb

2006-04-25 Thread vlendec

Author: vlendec
Date: 2006-04-25 08:03:34 + (Tue, 25 Apr 2006)
New Revision: 15227

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

Log:
Fix a valgrind error. We are marshalling here, not unmarshalling.

Jeremy, can you check this? This was part of your -O6 on 64bit sweep.

Volker

Modified:
   branches/SAMBA_3_0/source/libsmb/samlogon_cache.c
   trunk/source/libsmb/samlogon_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/samlogon_cache.c
===
--- branches/SAMBA_3_0/source/libsmb/samlogon_cache.c   2006-04-25 07:56:31 UTC 
(rev 15226)
+++ branches/SAMBA_3_0/source/libsmb/samlogon_cache.c   2006-04-25 08:03:34 UTC 
(rev 15227)
@@ -151,10 +151,9 @@
prs_init( ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);

{
-   uint32 ts;
+   uint32 ts = (uint32)t;
if ( !prs_uint32( timestamp, ps, 0, ts ) )
return False;
-   t = (time_t)ts;
}

if ( net_io_user_info3(, user, ps, 0, 3, 0) ) 

Modified: trunk/source/libsmb/samlogon_cache.c
===
--- trunk/source/libsmb/samlogon_cache.c2006-04-25 07:56:31 UTC (rev 
15226)
+++ trunk/source/libsmb/samlogon_cache.c2006-04-25 08:03:34 UTC (rev 
15227)
@@ -151,10 +151,9 @@
prs_init( ps, RPC_MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);

{
-   uint32 ts;
+   uint32 ts = (uint32)t;
if ( !prs_uint32( timestamp, ps, 0, ts ) )
return False;
-   t = (time_t)ts;
}

if ( net_io_user_info3(, user, ps, 0, 3, 0) )

svn commit: samba r15228 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 08:24:50 + (Tue, 25 Apr 2006)
New Revision: 15228

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

Log:
Fix -n winbind option which has become meaningless with the persistent
cache.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
   trunk/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-04-25 08:03:34 UTC 
(rev 15227)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2006-04-25 08:24:50 UTC 
(rev 15228)
@@ -524,6 +524,12 @@
char *kstr;
struct cache_entry *centry;
 
+   extern BOOL opt_nocache;
+
+   if (opt_nocache) {
+   return NULL;
+   }
+
refresh_sequence_number(domain, False);
 
va_start(ap, format);

Modified: trunk/source/nsswitch/winbindd_cache.c
===
--- trunk/source/nsswitch/winbindd_cache.c  2006-04-25 08:03:34 UTC (rev 
15227)
+++ trunk/source/nsswitch/winbindd_cache.c  2006-04-25 08:24:50 UTC (rev 
15228)
@@ -524,6 +524,12 @@
char *kstr;
struct cache_entry *centry;
 
+   extern BOOL opt_nocache;
+
+   if (opt_nocache) {
+   return NULL;
+   }
+
refresh_sequence_number(domain, False);
 
va_start(ap, format);

svn commit: samba r15230 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 09:04:52 + (Tue, 25 Apr 2006)
New Revision: 15230

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

Log:
Add include dir for -Iheimdal_build earlier on - this should fix sun1

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 08:42:34 UTC 
(rev 15229)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 09:04:52 UTC 
(rev 15230)
@@ -295,7 +295,7 @@
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
-EXTRA_CFLAGS = -Iheimdal/lib/roken
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 
 ###

svn commit: samba r15231 - in branches/SAMBA_4_0/source: build/m4 build/smb_build lib/tls

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 09:21:40 + (Tue, 25 Apr 2006)
New Revision: 15231

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

Log:
Try to fix detection of ability of CC to generate dependencies

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/lib/tls/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 09:04:52 UTC 
(rev 15230)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 09:21:40 UTC 
(rev 15231)
@@ -217,12 +217,16 @@
 fi
 
 
-automatic_dependencies=no
+new_make=no
 AC_MSG_CHECKING([for GNU make = 3.81])
 if test x$GNU_MAKE = xyes; then
if $PERL -e  \$_ = '$GNU_MAKE_VERSION'; s/@:@^\d\.@:@.*//g; exit 
(\$_  3.81);; then
-   AX_CXXFLAGS_GCC_OPTION(-MT, [], [automatic_dependencies=yes], 
[])
+   new_make=yes
fi
 fi
+AC_MSG_RESULT($new_make)
+automatic_dependencies=no
+AX_CXXFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
+AC_MSG_CHECKING([Whether to use automatic dependencies])
 AC_MSG_RESULT($automatic_dependencies)
 AC_SUBST(automatic_dependencies)

Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===
--- branches/SAMBA_4_0/source/build/smb_build/TODO  2006-04-25 09:04:52 UTC 
(rev 15230)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO  2006-04-25 09:21:40 UTC 
(rev 15231)
@@ -1,6 +1,5 @@
 - make --enable-dso the default
  - fix module loading for selftest during non-developer builds
-- per-subsystem CFLAGS (which are inherited)
 - clearer distinction between dcerpc and ndr. seperate interface tables?
 - saner names for:
libcli.so.0.0.1 (rename to libsmb?)

Modified: branches/SAMBA_4_0/source/lib/tls/config.m4
===
--- branches/SAMBA_4_0/source/lib/tls/config.m4 2006-04-25 09:04:52 UTC (rev 
15230)
+++ branches/SAMBA_4_0/source/lib/tls/config.m4 2006-04-25 09:21:40 UTC (rev 
15231)
@@ -1,6 +1,9 @@
 ###
 # start SMB_EXT_LIB_GNUTLS
 # check for gnutls/gnutls.h and -lgnutls
+#
+# Should eventually change to simply:
+# SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls)
 AC_CHECK_HEADERS(gnutls/gnutls.h)
 AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
 if test x$ac_cv_header_gnutls_gnutls_h = xyes -a 
x$ac_cv_lib_ext_gnutls_gnutls_global_init = xyes;then

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

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 09:28:44 + (Tue, 25 Apr 2006)
New Revision: 15232

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

Log:
Look for CC flags, not C++ flags..

Modified:
   branches/SAMBA_4_0/source/build/m4/ax_cflags_gcc_option.m4
   branches/SAMBA_4_0/source/build/m4/check_cc.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/ax_cflags_gcc_option.m4
===
--- branches/SAMBA_4_0/source/build/m4/ax_cflags_gcc_option.m4  2006-04-25 
09:21:40 UTC (rev 15231)
+++ branches/SAMBA_4_0/source/build/m4/ax_cflags_gcc_option.m4  2006-04-25 
09:28:44 UTC (rev 15232)
@@ -6,10 +6,6 @@
 dnl the shellvar-default of CFLAGS of course. The order of arguments
 dnl stems from the explicit macros like AX_CFLAGS_WARN_ALL.
 dnl
-dnl The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add
-dnl to CXXFLAGS - and it uses the autoconf setup for C++ instead of C
-dnl (since it is possible to use different compilers for C and C++).
-dnl
 dnl The macro is a lot simpler than any special AX_CFLAGS_* macro (or
 dnl ac_cxx_rtti.m4 macro) but allows to check for arbitrary options.
 dnl However, if you use this macro in a few places, it would be great
@@ -17,7 +13,7 @@
 dnl ac-archive.
 dnl
 dnl   - $1 option-to-check-for : required (-option as non-value)
-dnl   - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case)
+dnl   - $2 shell-variable-to-add-to : CFLAGS
 dnl   - $3 action-if-found : add value to shellvariable
 dnl   - $4 action-if-not-found : nothing
 dnl
@@ -74,40 +70,6 @@
 ])
 
 
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_OLD], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$2])dnl
-AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR=no, unknown
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS=$[]FLAGS
-for ac_arg dnl
-in -pedantic  % m4_ifval($2,$2,-option)  dnl   GCC
-   #
-do FLAGS=$ac_save_[]FLAGS `echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS=$ac_save_[]FLAGS
- AC_LANG_RESTORE
-])
-case .$VAR in
- .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo  $[]m4_ifval($1,$1,FLAGS)  | grep  $VAR  21 /dev/null
-   then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)=$m4_ifval($1,$1,FLAGS) $VAR])
-  m4_ifval($1,$1,FLAGS)=$m4_ifval($1,$1,FLAGS) $VAR
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
 dnl -
 
 AC_DEFUN([AX_CFLAGS_GCC_OPTION_NEW], [dnl
@@ -143,42 +105,5 @@
 ])
 
 
-dnl the only difference - the LANG selection... and the default FLAGS
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION_NEW], [dnl
-AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
-AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc_option_$1])dnl
-AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR=no, unknown
- AC_LANG_SAVE
- AC_LANG_CXX
- ac_save_[]FLAGS=$[]FLAGS
-for ac_arg dnl
-in -pedantic  % m4_ifval($1,$1,-option)  dnl   GCC
-   #
-do FLAGS=$ac_save_[]FLAGS `echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
-   AC_TRY_COMPILE([],[return 0;],
-   [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
-done
- FLAGS=$ac_save_[]FLAGS
- AC_LANG_RESTORE
-])
-case .$VAR in
- .ok|.ok,*) m4_ifvaln($3,$3) ;;
-   .|.no|.no,*) m4_ifvaln($4,$4) ;;
-   *) m4_ifvaln($3,$3,[
-   if echo  $[]m4_ifval($2,$2,FLAGS)  | grep  $VAR  21 /dev/null
-   then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
-   else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)=$m4_ifval($2,$2,FLAGS) $VAR])
-  m4_ifval($2,$2,FLAGS)=$m4_ifval($2,$2,FLAGS) $VAR
-   fi ]) ;;
-esac
-AS_VAR_POPDEF([VAR])dnl
-AS_VAR_POPDEF([FLAGS])dnl
-])
-
 AC_DEFUN([AX_CFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
 [AX_CFLAGS_GCC_OPTION_NEW($@)],[AX_CFLAGS_GCC_OPTION_OLD($@)])])
-
-AC_DEFUN([AX_CXXFLAGS_GCC_OPTION],[ifelse(m4_bregexp([$2],[-]),-1,
-[AX_CXXFLAGS_GCC_OPTION_NEW($@)],[AX_CXXFLAGS_GCC_OPTION_OLD($@)])])

Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 09:21:40 UTC 
(rev 15231)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 09:28:44 UTC 
(rev 15232)
@@ -226,7 +226,7 @@
 fi
 AC_MSG_RESULT($new_make)
 automatic_dependencies=no
-AX_CXXFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
+AX_CFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
 AC_MSG_CHECKING([Whether to use automatic dependencies])
 AC_MSG_RESULT($automatic_dependencies)
 AC_SUBST(automatic_dependencies)

svn commit: samba r15233 - in branches/SAMBA_4_0/source/gtk/tools: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 09:45:15 + (Tue, 25 Apr 2006)
New Revision: 15233

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

Log:
Fix loading shared modules

Modified:
   branches/SAMBA_4_0/source/gtk/tools/gregedit.c


Changeset:
Modified: branches/SAMBA_4_0/source/gtk/tools/gregedit.c
===
--- branches/SAMBA_4_0/source/gtk/tools/gregedit.c  2006-04-25 09:28:44 UTC 
(rev 15232)
+++ branches/SAMBA_4_0/source/gtk/tools/gregedit.c  2006-04-25 09:45:15 UTC 
(rev 15233)
@@ -967,9 +967,9 @@
 {
int ret;
 
+   lp_load();
+
registry_init();
-
-   lp_load();
setup_logging(argv[0], DEBUG_STDERR);
 
mem_ctx = talloc_init(gregedit);

svn commit: samba r15234 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 09:56:39 + (Tue, 25 Apr 2006)
New Revision: 15234

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

Log:
Remove heimdal include paths from global CFLAGS

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2006-04-25 09:45:15 UTC 
(rev 15233)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2006-04-25 09:56:39 UTC 
(rev 15234)
@@ -218,7 +218,6 @@
 
 # if we ever get to using a host kerberos, we might add conditionals here
 AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
-CFLAGS=${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi 
-Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc 
-Iheimdal/lib/roken -Iheimdal/lib/des
 HAVE_KRB5=YES
 SMB_ENABLE(KERBEROS_LIB, YES)
 SMB_ENABLE(asn1_compile, YES)

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 09:45:15 UTC 
(rev 15233)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 09:56:39 UTC 
(rev 15234)
@@ -314,7 +314,7 @@
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
-EXTRA_CFLAGS = -Iheimdal/lib/roken -Iheimdal_build 
+EXTRA_CFLAGS =  -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = \
../heimdal/lib/roken/base64.o \
../heimdal/lib/roken/hex.o \
@@ -368,10 +368,8 @@
 ###
 # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
-EXTRA_CFLAGS = -D_GNU_SOURCE \
-   -Iheimdal_build -Iheimdal/lib/asn1
-OBJ_FILES = \
-   ../heimdal/lib/asn1/lex.ho 
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/asn1/lex.ho 
 # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 ###
 
@@ -410,9 +408,8 @@
 ###
 # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
-EXTRA_CFLAGS = -D_GNU_SOURCE -Iheimdal_build -Iheimdal/lib/com_err
-OBJ_FILES = \
-   ../heimdal/lib/com_err/lex.ho 
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/com_err/lex.ho 
 # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 ###

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

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 10:19:15 + (Tue, 25 Apr 2006)
New Revision: 15236

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

Log:
Fix -MT detection

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


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 09:57:18 UTC 
(rev 15235)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4  2006-04-25 10:19:15 UTC 
(rev 15236)
@@ -226,7 +226,7 @@
 fi
 AC_MSG_RESULT($new_make)
 automatic_dependencies=no
-AX_CFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
+AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ 
automatic_dependencies=$new_make ], [])
 AC_MSG_CHECKING([Whether to use automatic dependencies])
 AC_MSG_RESULT($automatic_dependencies)
 AC_SUBST(automatic_dependencies)

svn commit: samba r15237 - in branches/SAMBA_4_0/source/ntvfs: . cifs_posix_cli

2006-04-25 Thread sfrench

Author: sfrench
Date: 2006-04-25 11:36:15 + (Tue, 25 Apr 2006)
New Revision: 15237

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

Log:
Add primitive Samba 4 backend for cifs posix clients (based on simple backend).


Added:
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/README
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/cvfs.h
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/svfs_util.c
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/vfs_simple.c
Modified:
   branches/SAMBA_4_0/source/ntvfs/config.mk


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

svn commit: samba r15238 - in branches/SAMBA_4_0/source/libcli/ldap: .

2006-04-25 Thread idra

Author: idra
Date: 2006-04-25 11:50:32 + (Tue, 25 Apr 2006)
New Revision: 15238

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

Log:

Add some code to automatically reconnect if we want to.


Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.h


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c   2006-04-25 11:36:15 UTC 
(rev 15237)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c   2006-04-25 11:50:32 UTC 
(rev 15238)
@@ -28,6 +28,39 @@
 #include lib/tls/tls.h
 #include auth/auth.h
 
+struct ldap_simple_creds {
+   const char *dn;
+   const char *pw;
+};
+
+NTSTATUS ldap_rebind(struct ldap_connection *conn)
+{
+   NTSTATUS status;
+   struct ldap_simple_creds *creds;
+
+   switch (conn-bind.type) {
+   case LDAP_BIND_SASL:
+   status = ldap_bind_sasl(conn, (struct cli_credentials 
*)conn-bind.creds);
+   break;
+   
+   case LDAP_BIND_SIMPLE:
+   creds = (struct ldap_simple_creds *)conn-bind.creds;
+
+   if (creds == NULL) {
+   return NT_STATUS_UNSUCCESSFUL;
+   }
+
+   status = ldap_bind_simple(conn, creds-dn, creds-pw);
+   break;
+
+   default:
+   return NT_STATUS_UNSUCCESSFUL;
+   }
+
+   return status;
+}
+
+
 static struct ldap_message *new_ldap_simple_bind_msg(struct ldap_connection 
*conn, 
 const char *dn, const char 
*pw)
 {
@@ -110,6 +143,20 @@
 
talloc_free(req);
 
+   if (NT_STATUS_IS_OK(status)) {
+   struct ldap_simple_creds *creds = talloc(conn, struct 
ldap_simple_creds);
+   if (creds == NULL) {
+   return NT_STATUS_NO_MEMORY;
+   }
+   creds-dn = talloc_strdup(creds, dn);
+   creds-pw = talloc_strdup(creds, pw);
+   if (creds-dn == NULL || creds-pw == NULL) {
+   return NT_STATUS_NO_MEMORY;
+   }
+   conn-bind.type = LDAP_BIND_SIMPLE;
+   conn-bind.creds = creds;
+   }
+
return status;
 }
 
@@ -325,6 +372,12 @@
}
 
talloc_free(tmp_ctx);
+
+   if (NT_STATUS_IS_OK(status)) {
+   conn-bind.type = LDAP_BIND_SASL;
+   conn-bind.creds = creds;
+   }
+
return status;
 
 failed:

Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2006-04-25 11:36:15 UTC 
(rev 15237)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2006-04-25 11:50:32 UTC 
(rev 15238)
@@ -33,6 +33,7 @@
 #include libcli/composite/composite.h
 #include lib/stream/packet.h
 #include auth/gensec/gensec.h
+#include system/time.h
 
 
 /*
@@ -62,10 +63,12 @@
/* set a reasonable request timeout */
conn-timeout = 60;
 
+   /* explicitly avoid reconnections by default */
+   conn-reconnect.max_retries = 0;
+   
return conn;
 }
 
-
 /*
   the connection is dead
 */
@@ -73,6 +76,7 @@
 {
struct ldap_request *req;
 
+   /* return an error for any pending request ... */
while (conn-pending) {
req = conn-pending;
DLIST_REMOVE(req-conn-pending, req);
@@ -84,9 +88,16 @@
}   
 
talloc_free(conn-tls);
+   talloc_free(conn-sock); /* this will also free event.fde */
+   talloc_free(conn-packet);
conn-tls = NULL;
+   conn-sock = NULL;
+   conn-event.fde = NULL;
+   conn-packet = NULL;
 }
 
+static void ldap_reconnect(struct ldap_connection *conn);
+
 /*
   handle packet errors
 */
@@ -95,6 +106,9 @@
struct ldap_connection *conn = talloc_get_type(private_data, 
   struct ldap_connection);
ldap_connection_dead(conn);
+
+   /* but try to reconnect so that the ldb client can go on */
+   ldap_reconnect(conn);
 }
 
 
@@ -325,6 +339,11 @@
struct composite_context *result, *ctx;
struct ldap_connect_state *state;
 
+   if (conn-reconnect.url == NULL) {
+   conn-reconnect.url = talloc_strdup(conn, url);
+   if (conn-reconnect.url == NULL) goto failed;
+   }
+
result = talloc_zero(NULL, struct composite_context);
if (result == NULL) goto failed;
result-state = COMPOSITE_STATE_IN_PROGRESS;
@@ -419,6 +438,40 @@
return ldap_connect_recv(ctx);
 }
 
+/* Actually this function is NOT ASYNC safe, FIXME? */
+static void ldap_reconnect(struct ldap_connection *conn)
+{
+   NTSTATUS status;
+

svn commit: samba r15239 - in branches/SAMBA_4_0/source/ntvfs/nbench: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 12:19:19 + (Tue, 25 Apr 2006)
New Revision: 15239

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

Log:
(hopefully) fix Samba4 build on AIX

Modified:
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-25 11:50:32 UTC 
(rev 15238)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-25 12:19:19 UTC 
(rev 15239)
@@ -314,6 +314,7 @@
 {
NTSTATUS status;
 
+#undef open
PASS_THRU_REQ(ntvfs, req, open, io, (ntvfs, req, io));
 
return status;

svn commit: samba r15240 - branches/SAMBA_3_0/source branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/libads branches/SAMBA_3_0/source/libsmb branches/SAMBA_3_0/source/nsswitch trunk/source

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 12:24:25 + (Tue, 25 Apr 2006)
New Revision: 15240

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

Log:
Correctly disallow unauthorized access when logging on with the
kerberized pam_winbind and workstation restrictions are in effect.

The krb5 AS-REQ needs to add the host netbios-name in the address-list.

We don't get the clear NT_STATUS_INVALID_WORKSTATION code back yet from
the edata of the KRB_ERROR but the login at least fails when the local
machine is not in the workstation list on the DC.

Guenther

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/include/ads.h
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/libads/kerberos.c
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   branches/SAMBA_3_0/source/libsmb/nmblib.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   trunk/source/Makefile.in
   trunk/source/configure.in
   trunk/source/include/ads.h
   trunk/source/include/includes.h
   trunk/source/libads/kerberos.c
   trunk/source/libsmb/clikrb5.c
   trunk/source/libsmb/nmblib.c
   trunk/source/nsswitch/winbindd_cred_cache.c
   trunk/source/nsswitch/winbindd_pam.c


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

svn commit: samba r15241 - in branches/SAMBA_4_0/source/libcli/ldap: .

2006-04-25 Thread idra

Author: idra
Date: 2006-04-25 12:34:13 + (Tue, 25 Apr 2006)
New Revision: 15241

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

Log:

Add helper function to set reconnect status defaults


Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2006-04-25 12:24:25 UTC 
(rev 15240)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2006-04-25 12:34:13 UTC 
(rev 15241)
@@ -438,6 +438,17 @@
return ldap_connect_recv(ctx);
 }
 
+/* set reconnect parameters */
+
+void ldap_set_reconn_params(struct ldap_connection *conn, int max_retries)
+{
+   if (conn) {
+   conn-reconnect.max_retries = max_retries;
+   conn-reconnect.retries = 0;
+   conn-reconnect.previous = time(NULL);
+   }
+}
+
 /* Actually this function is NOT ASYNC safe, FIXME? */
 static void ldap_reconnect(struct ldap_connection *conn)
 {

svn commit: samba r15242 - in branches/SAMBA_4_0/source/lib/ldb/ldb_ildap: .

2006-04-25 Thread idra

Author: idra
Date: 2006-04-25 12:34:58 + (Tue, 25 Apr 2006)
New Revision: 15242

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

Log:

allow to use LDB_FLG_RECONNECT


Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-04-25 
12:34:13 UTC (rev 15241)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-04-25 
12:34:58 UTC (rev 15242)
@@ -1011,6 +1011,10 @@
goto failed;
}
 
+   if (flags == LDB_FLG_RECONNECT) {
+   ldap_set_reconn_params(ildb-ldap, 10);
+   }
+
status = ldap_connect(ildb-ldap, url);
if (!NT_STATUS_IS_OK(status)) {
ldb_debug(ldb, LDB_DEBUG_ERROR, Failed to connect to ldap URL 
'%s' - %s\n,

svn commit: samba r15243 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/libsmb trunk/source/include trunk/source/libsmb

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 12:53:38 + (Tue, 25 Apr 2006)
New Revision: 15243

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

Log:
Sorry for the breakage:
* Fix the build without kerberos headers
* Fix memleak in the krb5_address handling

Guenther

Modified:
   branches/SAMBA_3_0/source/include/ads.h
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   trunk/source/include/ads.h
   trunk/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/ads.h
===
--- branches/SAMBA_3_0/source/include/ads.h 2006-04-25 12:34:58 UTC (rev 
15242)
+++ branches/SAMBA_3_0/source/include/ads.h 2006-04-25 12:53:38 UTC (rev 
15243)
@@ -271,10 +271,14 @@
 #define KRB5_ADDR_NETBIOS 0x14
 #endif
 
+#ifdef HAVE_KRB5
 typedef struct {
 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS)  
defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
krb5_address **addrs;
-#else /* Heimdal has the krb5_addresses type */
+#elif defined(HAVE_KRB5_ADDRESSES) /* Heimdal */
krb5_addresses *addrs;
+#else
+#error UNKNOWN_KRB5_ADDRESS_TYPE
 #endif
 } smb_krb5_addresses;
+#endif

Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c  2006-04-25 12:34:58 UTC (rev 
15242)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c  2006-04-25 12:53:38 UTC (rev 
15243)
@@ -1208,6 +1208,9 @@
  krb5_error_code smb_krb5_free_addresses(krb5_context context, 
smb_krb5_addresses *addr)
 {
krb5_error_code ret = 0;
+   if (addr == NULL) {
+   return ret;
+   }
 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS)  
defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
krb5_free_addresses(context, addr-addrs);
 #elif defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* Heimdal */
@@ -1242,6 +1245,7 @@
 
addrs = (krb5_address **)SMB_MALLOC(sizeof(krb5_address *) * 
num_addr);
if (addrs == NULL) {
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 
@@ -1250,6 +1254,7 @@
addrs[0] = (krb5_address *)SMB_MALLOC(sizeof(krb5_address));
if (addrs[0] == NULL) {
SAFE_FREE(addrs);
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 
@@ -1260,6 +1265,7 @@
if (addrs[0]-contents == NULL) {
SAFE_FREE(addrs[0]);
SAFE_FREE(addrs);
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 
@@ -1271,6 +1277,7 @@
{
addrs = (krb5_addresses *)SMB_MALLOC(sizeof(krb5_addresses));
if (addrs == NULL) {
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 
@@ -1280,6 +1287,7 @@
addrs-val = (krb5_address *)SMB_MALLOC(sizeof(krb5_address));
if (addrs-val == NULL) {
SAFE_FREE(addrs);
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 
@@ -1289,6 +1297,7 @@
if (addrs-val[0].address.data == NULL) {
SAFE_FREE(addrs-val);
SAFE_FREE(addrs);
+   SAFE_FREE(kerb_addr);
return ENOMEM;
}
 

Modified: trunk/source/include/ads.h
===
--- trunk/source/include/ads.h  2006-04-25 12:34:58 UTC (rev 15242)
+++ trunk/source/include/ads.h  2006-04-25 12:53:38 UTC (rev 15243)
@@ -271,10 +271,14 @@
 #define KRB5_ADDR_NETBIOS 0x14
 #endif
 
+#ifdef HAVE_KRB5
 typedef struct {
 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS)  
defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
krb5_address **addrs;
-#else /* Heimdal has the krb5_addresses type */
+#elif defined(HAVE_KRB5_ADDRESSES) /* Heimdal */
krb5_addresses *addrs;
+#else
+#error UNKNOWN_KRB5_ADDRESS_TYPE
 #endif
 } smb_krb5_addresses;
+#endif

Modified: trunk/source/libsmb/clikrb5.c
===
--- trunk/source/libsmb/clikrb5.c   2006-04-25 12:34:58 UTC (rev 15242)
+++ trunk/source/libsmb/clikrb5.c   2006-04-25 12:53:38 UTC (rev 15243)
@@ -1208,6 +1208,9 @@
  krb5_error_code smb_krb5_free_addresses(krb5_context context, 
smb_krb5_addresses *addr)
 {
krb5_error_code ret = 0;
+   if (addr == NULL) {
+   return ret;
+   }
 #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS)  
defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
krb5_free_addresses(context, addr-addrs);
 #elif defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* Heimdal */
@@ -1242,6 +1245,7 @@
 
addrs = (krb5_address **)SMB_MALLOC(sizeof(krb5_address *) * 
num_addr);
if

svn commit: samba r15244 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 13:50:35 + (Tue, 25 Apr 2006)
New Revision: 15244

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

Log:
Fix debug typo.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
   trunk/source/nsswitch/winbindd_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c   2006-04-25 12:53:38 UTC 
(rev 15243)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c   2006-04-25 13:50:35 UTC 
(rev 15244)
@@ -428,7 +428,7 @@

if ( (user = netsamlogon_cache_get( mem_ctx, user_sid )) != NULL )
{
-   DEBUG(5,(query_user: Cache lookup succeeded for %s\n, 
+   DEBUG(5,(lookup_usergroups: Cache lookup succeeded for %s\n, 
sid_string_static(user_sid)));

*num_groups = user-num_groups;

Modified: trunk/source/nsswitch/winbindd_rpc.c
===
--- trunk/source/nsswitch/winbindd_rpc.c2006-04-25 12:53:38 UTC (rev 
15243)
+++ trunk/source/nsswitch/winbindd_rpc.c2006-04-25 13:50:35 UTC (rev 
15244)
@@ -480,7 +480,7 @@

if ( (user = netsamlogon_cache_get( mem_ctx, user_sid )) != NULL )
{
-   DEBUG(5,(query_user: Cache lookup succeeded for %s\n, 
+   DEBUG(5,(lookup_usergroups: Cache lookup succeeded for %s\n, 
sid_string_static(user_sid)));

*num_groups = user-num_groups;

svn commit: samba r15245 - in branches/SAMBA_4_0/source/lib/ldb/include: .

2006-04-25 Thread idra

Author: idra
Date: 2006-04-25 16:08:55 + (Tue, 25 Apr 2006)
New Revision: 15245

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

Log:

forgot one header


Modified:
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-04-25 13:50:35 UTC 
(rev 15244)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-04-25 16:08:55 UTC 
(rev 15245)
@@ -233,6 +233,15 @@
 */
 #define LDB_FLG_NOSYNC 2
 
+/**
+   Flag value to specify autoreconnect mode.
+
+   If LDB_FLG_RECONNECT is used in ldb_connect, then the backend will
+   be opened in a way that makes it try to auto reconnect if the
+   connection is dropped (actually make sense only with ldap).
+*/
+#define LDB_FLG_RECONNECT 3
+
 /*! \cond DOXYGEN_IGNORE */
 #ifndef PRINTF_ATTRIBUTE
 #define PRINTF_ATTRIBUTE(a,b)

svn commit: samba r15246 - in branches/SAMBA_4_0/source/lib/ldb/include: .

2006-04-25 Thread metze

Author: metze
Date: 2006-04-25 16:21:56 + (Tue, 25 Apr 2006)
New Revision: 15246

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

Log:
flags need to represented as bits 0x01,0x02,0x04,0x08,0x10,...

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-04-25 16:08:55 UTC 
(rev 15245)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-04-25 16:21:56 UTC 
(rev 15246)
@@ -240,7 +240,7 @@
be opened in a way that makes it try to auto reconnect if the
connection is dropped (actually make sense only with ldap).
 */
-#define LDB_FLG_RECONNECT 3
+#define LDB_FLG_RECONNECT 4
 
 /*! \cond DOXYGEN_IGNORE */
 #ifndef PRINTF_ATTRIBUTE

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

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 16:31:12 + (Tue, 25 Apr 2006)
New Revision: 15247

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

Log:
Get rid of patsubst macro as it is not supported by some makes and replace 
it with a perl script.
This should fix the build on tru64

Added:
   branches/SAMBA_4_0/source/librpc/idl-deps.pl
Modified:
   branches/SAMBA_4_0/source/main.mk


Changeset:
Added: branches/SAMBA_4_0/source/librpc/idl-deps.pl
===
--- branches/SAMBA_4_0/source/librpc/idl-deps.pl2006-04-25 16:21:56 UTC 
(rev 15246)
+++ branches/SAMBA_4_0/source/librpc/idl-deps.pl2006-04-25 16:31:12 UTC 
(rev 15247)
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+use strict;
+
+my %vars = ();
+
+foreach(@ARGV) {
+   push (@{$vars{IDL_FILES}}, $_);
+   my $b = $_; $b =~ s/.*\/(.*?).idl$/\1/;
+   push (@{$vars{IDL_HEADER_FILES}}, librpc/gen_ndr/$b.h);
+   push (@{$vars{IDL_NDR_HEADER_FILES}}, librpc/gen_ndr/ndr_$b.h);
+   push (@{$vars{IDL_NDR_PARSE_FILES}}, librpc/gen_ndr/ndr_$b.c);
+   push (@{$vars{IDL_NDR_CLIENT_C_FILES}}, librpc/gen_ndr/ndr_$b\_c.c);
+   push (@{$vars{IDL_NDR_CLIENT_HEADER_FILES}}, 
librpc/gen_ndr/ndr_$b\_c.h);
+   push (@{$vars{IDL_NDR_SERVER_C_FILES}}, librpc/gen_ndr/ndr_$b\_s.c);
+   push (@{$vars{IDL_NDR_EJS_C_FILES}}, librpc/gen_ndr/ndr_$b\_ejs.c);
+   push (@{$vars{IDL_NDR_EJS_H_FILES}}, librpc/gen_ndr/ndr_$b\_ejs.h);
+}
+
+foreach (keys %vars) {
+   print $_ =  . join (' ', @{$vars{$_}}) . \n;
+}


Property changes on: branches/SAMBA_4_0/source/librpc/idl-deps.pl
___
Name: svn:executable
   + *

Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk   2006-04-25 16:21:56 UTC (rev 15246)
+++ branches/SAMBA_4_0/source/main.mk   2006-04-25 16:31:12 UTC (rev 15247)
@@ -188,15 +188,7 @@
 uninstallpidl: pidl/Makefile
$(MAKE) -C pidl uninstall
 
-IDL_FILES = $(wildcard librpc/idl/*.idl)
-IDL_HEADER_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/%.h,$(IDL_FILES))
-IDL_NDR_HEADER_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,$(IDL_FILES))
-IDL_NDR_PARSE_C_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%.c,$(IDL_FILES))
-IDL_NDR_CLIENT_C_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%_c.c,$(IDL_FILES))
-IDL_NDR_CLIENT_HEADER_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%_c.h,$(IDL_FILES))
-IDL_NDR_SERVER_C_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%_s.c,$(IDL_FILES))
-IDL_NDR_EJS_C_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.c,$(IDL_FILES))
-IDL_NDR_EJS_H_FILES = $(patsubst 
librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.h,$(IDL_FILES))
+include librpc/idl-deps.pl librpc/idl/*.idl|
 
 $(IDL_HEADER_FILES) $(IDL_NDR_HEADER_FILES) $(IDL_NDR_PARSE_C_FILES) \
$(IDL_NDR_CLIENT_C_FILES) $(IDL_NDR_CLIENT_H_FILES) \
@@ -319,7 +311,7 @@
@$(CC) -M -MG -MP -MT $(:.c=.o) `$(PERL) $(srcdir)/script/cflags.pl 
[EMAIL PROTECTED] $(CFLAGS) $ -o $@
 
 .c.hd:
-   @echo Generating dependencies for $
+   @echo Generating host-compiler dependencies for $
@$(CC) -M -MG -MP -MT $(:.c=.ho) `$(PERL) $(srcdir)/script/cflags.pl 
[EMAIL PROTECTED] $(CFLAGS) $ -o $@
 
 include/includes.d: include/includes.h

svn commit: samba r15248 - in branches/SAMBA_4_0/source: build/smb_build heimdal_build lib/registry

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 16:35:06 + (Tue, 25 Apr 2006)
New Revision: 15248

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

Log:
Fix automatic dependencies build

Modified:
   branches/SAMBA_4_0/source/build/smb_build/env.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/registry/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/env.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/env.pm2006-04-25 16:31:12 UTC 
(rev 15247)
+++ branches/SAMBA_4_0/source/build/smb_build/env.pm2006-04-25 16:35:06 UTC 
(rev 15248)
@@ -53,9 +53,9 @@
$self-{automatic_deps} = ($self-{config}-{automatic_dependencies} eq 
yes);
 }
 
-sub PkgConfig()
+sub PkgConfig($$)
 {
-   my ($self,$path,$name,$libs,$cflags,$version,$desc,$hasmodules) = @_;
+   my 
($self,$path,$name,$libs,$cflags,$version,$desc,$hasmodules,$pubdep,$privdep) = 
@_;
 
print __FILE__.: creating $path\n;
 
@@ -83,6 +83,8 @@
if (defined($desc)) {
print OUT Description: $desc\n;
}
+   print OUT Requires: $pubdep\n if defined($pubdep);
+   print OUT Requires.private: $privdep\n if defined($privdep);
print OUT Version: $version\n;
print OUT Libs: -L\${libdir} $libs\n;
print OUT Cflags: -I\${includedir} $cflags\n;

Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/input.pm  2006-04-25 16:31:12 UTC 
(rev 15247)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm  2006-04-25 16:35:06 UTC 
(rev 15248)
@@ -203,8 +203,8 @@
push (@{$part-{DEPENDENCIES}}, \$depend{$key});
}
 
-   delete ($part-{PRIVATE_DEPENDENCIES});
-   delete ($part-{PUBLIC_DEPENDENCIES});
+#  delete ($part-{PRIVATE_DEPENDENCIES});
+#  delete ($part-{PUBLIC_DEPENDENCIES});
}
 
foreach my $part (values %depend) {

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-04-25 
16:31:12 UTC (rev 15247)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-04-25 
16:35:06 UTC (rev 15248)
@@ -70,7 +70,7 @@
 prefix = $self-{config}-{prefix}
 exec_prefix = $self-{config}-{exec_prefix}
 selftest_prefix = $self-{config}-{selftest_prefix}
-VPATH = 
$self-{config}-{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
+VPATH = 
$self-{config}-{srcdir}:heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
 srcdir = $self-{config}-{srcdir}
 builddir = $self-{config}-{builddir}
 
@@ -457,6 +457,25 @@
 
push (@{$self-{pc_files}}, $path);
 
+   my $pubs;
+   my $privs;
+
+   if (defined($ctx-{PUBLIC_DEPENDENCIES})) {
+   foreach (@{$ctx-{PUBLIC_DEPENDENCIES}}) {
+#  next unless ($self- ) {
+
+   $pubs .= $_ ;
+   }
+   }
+
+   if (defined($ctx-{PRIVATE_DEPENDENCIES})) {
+   foreach (@{$ctx-{PRIVATE_DEPENDENCIES}}) {
+#  next unless ($self- ) {
+
+   $privs .= $_ ;
+   }
+   }
+
smb_build::env::PkgConfig($self,
$path,
$link_name,
@@ -464,7 +483,9 @@
,
$ctx-{VERSION},
$ctx-{DESCRIPTION},
-   defined($ctx-{INIT_FUNCTIONS})
+   defined($ctx-{INIT_FUNCTIONS}),
+   $pubs,
+   $privs
); 
 }
 
@@ -499,7 +520,7 @@
$ctx-{PUBLIC_PROTO_HEADER} = $ctx-{PRIVATE_PROTO_HEADER};
}   
 
-   $self-output($dir/$ctx-{PUBLIC_PROTO_HEADER}: $ctx-{MK_FILE} 
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST:.o=.c)\n);
+   $self-output($dir/$ctx-{PUBLIC_PROTO_HEADER}: $ctx-{MK_FILE} 
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n);
$self-output([EMAIL PROTECTED] \$comment\\n);
 
$self-output([EMAIL PROTECTED](PERL) \$(srcdir)/script/mkproto.pl 
--srcdir=\$(srcdir) --builddir=\$(builddir) 
--private=$dir/$ctx-{PRIVATE_PROTO_HEADER} 
--public=$dir/$ctx-{PUBLIC_PROTO_HEADER} 
\$($ctx-{TYPE}_$ctx-{NAME}_OBJ_LIST)\n\n);

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 16:31:12 UTC 
(rev 15247)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk

svn commit: samba r15249 - in branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 16:38:09 + (Tue, 25 Apr 2006)
New Revision: 15249

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

Log:
Fix typos

Modified:
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/vfs_simple.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/vfs_simple.c
===
--- branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/vfs_simple.c 2006-04-25 
16:35:06 UTC (rev 15248)
+++ branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/vfs_simple.c 2006-04-25 
16:38:09 UTC (rev 15249)
@@ -819,7 +819,7 @@
file.both_directory_info.name.s = dir-files[i].name;
file.both_directory_info.short_name.s = dir-files[i].name;
file.both_directory_info.size = dir-files[i].st.st_size;
-   file.both_directory_info.attrib = 
svfs_unix_to_dos_attrib(dir-files[i].st.st_mode);
+   file.both_directory_info.attrib = 
cvfs_unix_to_dos_attrib(dir-files[i].st.st_mode);
 
if (!callback(search_private, file)) {
break;
@@ -910,7 +910,7 @@
file.both_directory_info.name.s = dir-files[i].name;
file.both_directory_info.short_name.s = dir-files[i].name;
file.both_directory_info.size = dir-files[i].st.st_size;
-   file.both_directory_info.attrib = 
svfs_unix_to_dos_attrib(dir-files[i].st.st_mode);
+   file.both_directory_info.attrib = 
cvfs_unix_to_dos_attrib(dir-files[i].st.st_mode);
 
if (!callback(search_private, file)) {
break;

svn commit: samba r15250 - branches/SAMBA_3_0/examples/misc branches/SAMBA_3_0/source/libads trunk/examples/misc trunk/source/libads

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 20:13:05 + (Tue, 25 Apr 2006)
New Revision: 15250

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

Log:
dump some more sids.

Guenther

Modified:
   branches/SAMBA_3_0/examples/misc/adssearch.pl
   branches/SAMBA_3_0/source/libads/ldap.c
   trunk/examples/misc/adssearch.pl
   trunk/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/examples/misc/adssearch.pl
===
--- branches/SAMBA_3_0/examples/misc/adssearch.pl   2006-04-25 16:38:09 UTC 
(rev 15249)
+++ branches/SAMBA_3_0/examples/misc/adssearch.pl   2006-04-25 20:13:05 UTC 
(rev 15250)
@@ -436,6 +436,7 @@
modifyTimeStamp   = \dump_timestr,
msDS-Behavior-Version = \dump_ds_func,  #unsure
msDS-User-Account-Control-Computed = \dump_uacc,
+   mS-DS-CreatorSID  = \dump_sid,
 #  msRADIUSFramedIPAddress   = \dump_ipaddr,
 #  msRASSavedFramedIPAddress = \dump_ipaddr,
netbootGUID   = \dump_guid,
@@ -457,6 +458,7 @@
systemFlags   = \dump_systemflags,
tokenGroups,  = \dump_sid,
tokenGroupsGlobalAndUniversal = \dump_sid,
+   tokenGroupsNoGCAcceptable = \dump_sid,
trustAttributes   = \dump_trustattr,
trustDirection= \dump_trustdirection,
trustType = \dump_trusttype,

Modified: branches/SAMBA_3_0/source/libads/ldap.c
===
--- branches/SAMBA_3_0/source/libads/ldap.c 2006-04-25 16:38:09 UTC (rev 
15249)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2006-04-25 20:13:05 UTC (rev 
15250)
@@ -1665,6 +1665,8 @@
{dnsRecord, False, dump_binary},
{objectSid, False, dump_sid},
{tokenGroups, False, dump_sid},
+   {tokenGroupsNoGCAcceptable, False, dump_sid},
+   {tokengroupsGlobalandUniversal, False, dump_sid},
{NULL, True, NULL}
};
int i;

Modified: trunk/examples/misc/adssearch.pl
===
--- trunk/examples/misc/adssearch.pl2006-04-25 16:38:09 UTC (rev 15249)
+++ trunk/examples/misc/adssearch.pl2006-04-25 20:13:05 UTC (rev 15250)
@@ -436,6 +436,7 @@
modifyTimeStamp   = \dump_timestr,
msDS-Behavior-Version = \dump_ds_func,  #unsure
msDS-User-Account-Control-Computed = \dump_uacc,
+   mS-DS-CreatorSID  = \dump_sid,
 #  msRADIUSFramedIPAddress   = \dump_ipaddr,
 #  msRASSavedFramedIPAddress = \dump_ipaddr,
netbootGUID   = \dump_guid,
@@ -457,6 +458,7 @@
systemFlags   = \dump_systemflags,
tokenGroups,  = \dump_sid,
tokenGroupsGlobalAndUniversal = \dump_sid,
+   tokenGroupsNoGCAcceptable = \dump_sid,
trustAttributes   = \dump_trustattr,
trustDirection= \dump_trustdirection,
trustType = \dump_trusttype,

Modified: trunk/source/libads/ldap.c
===
--- trunk/source/libads/ldap.c  2006-04-25 16:38:09 UTC (rev 15249)
+++ trunk/source/libads/ldap.c  2006-04-25 20:13:05 UTC (rev 15250)
@@ -1665,6 +1665,8 @@
{dnsRecord, False, dump_binary},
{objectSid, False, dump_sid},
{tokenGroups, False, dump_sid},
+   {tokenGroupsNoGCAcceptable, False, dump_sid},
+   {tokengroupsGlobalandUniversal, False, dump_sid},
{NULL, True, NULL}
};
int i;

svn commit: samba r15251 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/lib trunk/source/include trunk/source/lib

2006-04-25 Thread gd

Author: gd
Date: 2006-04-25 20:14:46 + (Tue, 25 Apr 2006)
New Revision: 15251

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

Log:
Adding PreWin2kAccess builtin sid.

Guenther

Modified:
   branches/SAMBA_3_0/source/include/smb.h
   branches/SAMBA_3_0/source/lib/util_sid.c
   trunk/source/include/smb.h
   trunk/source/lib/util_sid.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/smb.h
===
--- branches/SAMBA_3_0/source/include/smb.h 2006-04-25 20:13:05 UTC (rev 
15250)
+++ branches/SAMBA_3_0/source/include/smb.h 2006-04-25 20:14:46 UTC (rev 
15251)
@@ -330,6 +330,7 @@
 extern const DOM_SID global_sid_Builtin_Print_Operators;
 extern const DOM_SID global_sid_Builtin_Backup_Operators;
 extern const DOM_SID global_sid_Builtin_Replicator;
+extern const DOM_SID global_sid_Builtin_PreWin2kAccess;
 extern const DOM_SID global_sid_Unix_Users;
 extern const DOM_SID global_sid_Unix_Groups;
 

Modified: branches/SAMBA_3_0/source/lib/util_sid.c
===
--- branches/SAMBA_3_0/source/lib/util_sid.c2006-04-25 20:13:05 UTC (rev 
15250)
+++ branches/SAMBA_3_0/source/lib/util_sid.c2006-04-25 20:14:46 UTC (rev 
15251)
@@ -74,6 +74,8 @@
 { 1, 2, {0,0,0,0,0,5}, {32,551,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 const DOM_SID global_sid_Builtin_Replicator =  /* Builtin replicator */
 { 1, 2, {0,0,0,0,0,5}, {32,552,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+const DOM_SID global_sid_Builtin_PreWin2kAccess =  /* Builtin pre win2k 
access */
+{ 1, 2, {0,0,0,0,0,5}, {32,554,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 
 const DOM_SID global_sid_Unix_Users =  /* Unmapped Unix users 
*/
 { 1, 1, {0,0,0,0,0,22}, {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};

Modified: trunk/source/include/smb.h
===
--- trunk/source/include/smb.h  2006-04-25 20:13:05 UTC (rev 15250)
+++ trunk/source/include/smb.h  2006-04-25 20:14:46 UTC (rev 15251)
@@ -327,6 +327,7 @@
 extern const DOM_SID global_sid_Builtin_Print_Operators;
 extern const DOM_SID global_sid_Builtin_Backup_Operators;
 extern const DOM_SID global_sid_Builtin_Replicator;
+extern const DOM_SID global_sid_Builtin_PreWin2kAccess;
 extern const DOM_SID global_sid_Unix_Users;
 extern const DOM_SID global_sid_Unix_Groups;
 

Modified: trunk/source/lib/util_sid.c
===
--- trunk/source/lib/util_sid.c 2006-04-25 20:13:05 UTC (rev 15250)
+++ trunk/source/lib/util_sid.c 2006-04-25 20:14:46 UTC (rev 15251)
@@ -74,6 +74,8 @@
 { 1, 2, {0,0,0,0,0,5}, {32,551,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 const DOM_SID global_sid_Builtin_Replicator =  /* Builtin replicator */
 { 1, 2, {0,0,0,0,0,5}, {32,552,0,0,0,0,0,0,0,0,0,0,0,0,0}};
+const DOM_SID global_sid_Builtin_PreWin2kAccess =  /* Builtin pre win2k 
access */
+{ 1, 2, {0,0,0,0,0,5}, {32,554,0,0,0,0,0,0,0,0,0,0,0,0,0}};
 
 const DOM_SID global_sid_Unix_Users =  /* Unmapped Unix users 
*/
 { 1, 1, {0,0,0,0,0,22}, {1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}};

svn commit: samba r15252 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 20:43:45 + (Tue, 25 Apr 2006)
New Revision: 15252

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

Log:
Fix inet_aton (required for Tru64 and Solaris)

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 20:14:46 UTC 
(rev 15251)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 20:43:45 UTC 
(rev 15252)
@@ -294,7 +294,7 @@
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
-EXTRA_CFLAGS = -Iheimdal_build 
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 
 ###

svn commit: samba r15253 - in branches/SAMBA_4_0/source/lib/registry: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 21:03:05 + (Tue, 25 Apr 2006)
New Revision: 15253

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

Log:
Fix dependency on tdr_regf.h

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-04-25 20:43:45 UTC 
(rev 15252)
+++ branches/SAMBA_4_0/source/lib/registry/config.mk2006-04-25 21:03:05 UTC 
(rev 15253)
@@ -16,6 +16,7 @@
 OBJ_FILES = tdr_regf.o
 
 # Special support for external builddirs
+lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
 $(srcdir)/lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
 lib/registry/tdr_regf.h: lib/registry/tdr_regf.c
 lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl

svn commit: samba r15254 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 21:15:00 + (Tue, 25 Apr 2006)
New Revision: 15254

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

Log:
Fix heimdal's addrinfo subsystem for those systems that need it. This 
should get the build on sun1 and us4 another step further.

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 21:03:05 UTC 
(rev 15253)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-25 21:15:00 UTC 
(rev 15254)
@@ -300,7 +300,7 @@
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
-EXTRA_CFLAGS = -Iheimdal/lib/roken
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = \
../heimdal/lib/roken/getaddrinfo.o \
../heimdal/lib/roken/freeaddrinfo.o \

svn commit: samba r15255 - branches/SAMBA_3_0/source/locking trunk/source/locking

2006-04-25 Thread tpot

Author: tpot
Date: 2006-04-25 21:36:35 + (Tue, 25 Apr 2006)
New Revision: 15255

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

Log:
Add return statement after abort to placate fussy compilers.  Closes #3721.

Modified:
   branches/SAMBA_3_0/source/locking/brlock.c
   trunk/source/locking/brlock.c


Changeset:
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===
--- branches/SAMBA_3_0/source/locking/brlock.c  2006-04-25 21:15:00 UTC (rev 
15254)
+++ branches/SAMBA_3_0/source/locking/brlock.c  2006-04-25 21:36:35 UTC (rev 
15255)
@@ -563,6 +563,8 @@
smb_panic(brlock_posix_split_merge\n);
/* Notreached. */
abort();
+   /* Keep some compilers happy. */
+   return 0;
 }
 
 /

Modified: trunk/source/locking/brlock.c
===
--- trunk/source/locking/brlock.c   2006-04-25 21:15:00 UTC (rev 15254)
+++ trunk/source/locking/brlock.c   2006-04-25 21:36:35 UTC (rev 15255)
@@ -563,6 +563,8 @@
smb_panic(brlock_posix_split_merge\n);
/* Notreached. */
abort();
+   /* Keep some compilers happy. */
+   return 0;
 }
 
 /

svn commit: samba r15256 - in branches/SAMBA_4_0/source/auth/kerberos: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 22:02:04 + (Tue, 25 Apr 2006)
New Revision: 15256

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

Log:
Use libroken's getaddrinfo if it is not provided by the system. Should 
get the build on IRIX a bit further.

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/auth/kerberos/kerberos.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-04-25 21:36:35 UTC 
(rev 15255)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-04-25 22:02:04 UTC 
(rev 15256)
@@ -9,6 +9,6 @@
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET HEIMDAL_ROKEN_ADDRINFO
 # End SUBSYSTEM KERBEROS
 #

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.c
===
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.c  2006-04-25 21:36:35 UTC 
(rev 15255)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.c  2006-04-25 22:02:04 UTC 
(rev 15256)
@@ -24,6 +24,7 @@
 
 #include includes.h
 #include system/kerberos.h
+#include roken.h
 
 #ifdef HAVE_KRB5

svn commit: samba r15257 - in branches/SAMBA_4_0/source: build/m4 lib/util

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 22:57:06 + (Tue, 25 Apr 2006)
New Revision: 15257

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

Log:
Look for headers before trying to use them in any tests. This 
should fix the OpenBSD build

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/lib/util/fsusage.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4   2006-04-25 22:02:04 UTC 
(rev 15256)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4   2006-04-25 22:57:06 UTC 
(rev 15257)
@@ -55,7 +55,7 @@
 AC_CHECK_HEADERS(utime.h grp.h sys/id.h limits.h compat.h math.h)
 AC_CHECK_HEADERS(ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h 
sys/mode.h)
 AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h 
strings.h stdlib.h)
-AC_CHECK_HEADERS(sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
+AC_CHECK_HEADERS(sys/fs/s5param.h sys/filsys.h termios.h termio.h)
 AC_CHECK_HEADERS(fnmatch.h pwd.h sys/termio.h sys/time.h)
 AC_CHECK_HEADERS(locale.h shadow.h)
 AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h sys/security.h)
@@ -63,12 +63,7 @@
 
 AC_CHECK_HEADERS(sys/capability.h)
 
-AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
-#ifdef HAVE_SYS_PARAM_H
-#include sys/param.h
-#endif])
 
-
 AC_TYPE_SIGNAL
 AC_TYPE_UID_T
 AC_TYPE_MODE_T

Modified: branches/SAMBA_4_0/source/lib/util/fsusage.m4
===
--- branches/SAMBA_4_0/source/lib/util/fsusage.m4   2006-04-25 22:02:04 UTC 
(rev 15256)
+++ branches/SAMBA_4_0/source/lib/util/fsusage.m4   2006-04-25 22:57:06 UTC 
(rev 15257)
@@ -1,7 +1,13 @@
 #
 # these tests are taken from the GNU fileutils package
 AC_CHECKING(how to get filesystem space usage)
-AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h)
+AC_CHECK_HEADERS(sys/statfs.h sys/statvfs.h sys/vfs.h)
+
+AC_CHECK_HEADERS(sys/mount.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_PARAM_H
+#include sys/param.h
+#endif])
+
 space=no
 
 # Test for statvfs64.

svn commit: samba r15258 - in branches/SAMBA_4_0/source/auth/kerberos: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-25 23:03:05 + (Tue, 25 Apr 2006)
New Revision: 15258

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

Log:
Another attempt at fixing getaddrinfo on IRIX

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
===
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c 2006-04-25 
22:57:06 UTC (rev 15257)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c 2006-04-25 
23:03:05 UTC (rev 15258)
@@ -27,6 +27,7 @@
 #include lib/socket/socket.h
 #include system/network.h
 #include lib/events/events.h
+#include roken.h
 
 /*
   context structure for operations on cldap packets

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

2006-04-25 Thread metze

Author: metze
Date: 2006-04-25 23:46:41 + (Tue, 25 Apr 2006)
New Revision: 15259

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

Log:
try to find the place that causes trouble on some build farm host
on the NBT-WINSREPLICATION-OWNED test

metze
Modified:
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2006-04-25 
23:03:05 UTC (rev 15258)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2006-04-25 
23:46:41 UTC (rev 15259)
@@ -9543,7 +9543,7 @@
 
/* make sure we push the reply to the wire */
event_loop_once(nbtsock-event_ctx);
-   msleep(500);
+   msleep(1000);
 
rec-defend.timeout = 0;
rec-defend.ret = True;
@@ -9596,7 +9596,7 @@
 
/* make sure we push the reply to the wire */
event_loop_once(nbtsock-event_ctx);
-   msleep(500);
+   msleep(1000);
 
rec-defend.timeout = 0;
rec-defend.ret = True;

Build status as of Wed Apr 26 00:00:01 2006

2006-04-25 Thread build

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2006-04-25 
00:00:41.0 +
+++ /home/build/master/cache/broken_results.txt 2006-04-26 00:00:03.0 
+
@@ -1,17 +1,17 @@
-Build status as of Tue Apr 25 00:00:02 2006
+Build status as of Wed Apr 26 00:00:01 2006
 
 Build counts:
 Tree Total  Broken Panic 
-ccache   5  0  0 
+ccache   6  0  0 
 distcc   11 1  0 
-lorikeet-heimdal 28 22 0 
-ppp  18 0  0 
-rsync34 1  0 
+lorikeet-heimdal 29 23 0 
+ppp  19 0  0 
+rsync33 1  0 
 samba2  0  0 
 samba-docs   0  0  0 
-samba4   39 30 1 
-samba_3_034 7  0 
+samba4   37 25 1 
+samba_3_034 6  0 
 smb-build25 0  0 
-talloc   28 15 0 
-tdb  27 2  0 
+talloc   30 16 0 
+tdb  30 3  0

svn commit: samba r15260 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-26 00:08:39 + (Wed, 26 Apr 2006)
New Revision: 15260

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

Log:
Don't dereference NULL pointers to obtain array lengths - found by 
the IBM checker

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-04-25 
23:46:41 UTC (rev 15259)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm 2006-04-26 
00:08:39 UTC (rev 15260)
@@ -117,6 +117,18 @@
 }
 
 #
+# check that a variable we get from ParseExpr isn't a null pointer
+sub check_null_pointer($)
+{
+   my $size = shift;
+   if ($size =~ /^\*/) {
+   my $size2 = substr($size, 1);
+   pidl if ($size2 == NULL) return 
NT_STATUS_INVALID_PARAMETER_MIX;;
+   }
+}
+
+
+#
 # work out is a parse function should be declared static or not
 sub fn_declare($$)
 {
@@ -196,6 +208,7 @@
if (!$l-{IS_FIXED}) {
pidl EJS_ALLOC_N(ejs, $var, $size);;
}
+   check_null_pointer($length);
pidl ejs_pull_array_uint8(ejs, v, $name, $var, $length);;
return;
}
@@ -492,6 +505,7 @@
}
# uint8 arrays are treated as data blobs
if ($nl-{TYPE} eq 'DATA'  $e-{TYPE} eq 'uint8') {
+   check_null_pointer($length);
pidl ejs_push_array_uint8(ejs, v, $name, $var, $length);;
return;
}

svn commit: samba r15261 - in branches/SAMBA_4_0/source/ntvfs/nbench: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-26 00:10:57 + (Wed, 26 Apr 2006)
New Revision: 15261

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

Log:
Work around AIX defining open as open64 again

Modified:
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-26 00:08:39 UTC 
(rev 15260)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c 2006-04-26 00:10:57 UTC 
(rev 15261)
@@ -25,8 +25,8 @@
 */
 
 #include includes.h
+#include ntvfs/ntvfs.h
 #include system/filesys.h
-#include ntvfs/ntvfs.h
 
 /* this is stored in ntvfs_private */
 struct nbench_private {
@@ -314,7 +314,7 @@
 {
NTSTATUS status;
 
-#undef open
+#undef open /* AIX defines open to be open64 */
PASS_THRU_REQ(ntvfs, req, open, io, (ntvfs, req, io));
 
return status;

svn commit: samba r15262 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-26 00:11:33 + (Wed, 26 Apr 2006)
New Revision: 15262

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

Log:
Only include getprogname if it is needed by the system. This should 
fix the build on Mac OS X

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4   2006-04-26 00:10:57 UTC 
(rev 15261)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4   2006-04-26 00:11:33 UTC 
(rev 15262)
@@ -62,6 +62,7 @@
 AC_CHECK_FUNCS([   \
atexit  \
cgetent \
+   getprogname \
inet_ntop   \
inet_aton   \
gethostname \
@@ -235,6 +236,14 @@
SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
 fi
 
+# only add getprogname if needed
+SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, NO)
+SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_HOST, NO)
+if test t$ac_cv_func_getprogname != tyes; then
+   SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES)
+   SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_HOST, YES)
+fi
+
 # only add gai_strerror if needed
 SMB_ENABLE(HEIMDAL_ROKEN_GAI_STRERROR, NO)
 AC_CHECK_FUNC(gai_strerror)

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-26 00:10:57 UTC 
(rev 15261)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-26 00:11:33 UTC 
(rev 15262)
@@ -297,6 +297,14 @@
 EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 
+[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/roken/getprogname.o
+
+[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_HOST]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
+OBJ_FILES = ../heimdal/lib/roken/getprogname.ho
+
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
@@ -309,6 +317,7 @@
../heimdal/lib/roken/freehostent.o \
../heimdal/lib/roken/copyhostent.o \
../heimdal/lib/roken/hostent_find_fqdn.o
+PRIVATE_DEPENDENCIES = EXT_LIB_SOCKET
 
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN
@@ -319,7 +328,6 @@
../heimdal/lib/roken/hex.o \
../heimdal/lib/roken/bswap.o \
../heimdal/lib/roken/get_window_size.o \
-   ../heimdal/lib/roken/getprogname.o \
../heimdal/lib/roken/h_errno.o \
../heimdal/lib/roken/issuid.o \
../heimdal/lib/roken/net_read.o \
@@ -340,6 +348,7 @@
HEIMDAL_ROKEN_ADDRINFO \
HEIMDAL_ROKEN_GAI_STRERROR \
HEIMDAL_ROKEN_INET_ATON \
+   HEIMDAL_ROKEN_GETPROGNAME \
EXT_LIB_GAI
 # End SUBSYSTEM HEIMDAL_ROKEN
 ###
@@ -391,7 +400,6 @@
../heimdal/lib/roken/getarg.ho \
../heimdal/lib/roken/setprogname.ho \
../heimdal/lib/roken/strupr.ho \
-   ../heimdal/lib/roken/getprogname.ho \
../heimdal/lib/roken/get_window_size.ho \
../heimdal/lib/roken/estrdup.ho \
../heimdal/lib/roken/ecalloc.ho \
@@ -400,7 +408,7 @@
../heimdal/lib/vers/print_version.ho \
../lib/replace/snprintf.ho \
../lib/replace/replace.ho
-PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX
+PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_HOST
 # End BINARY asn1_compile
 ###
 
@@ -421,13 +429,12 @@
../heimdal/lib/com_err/compile_et.ho \
../heimdal/lib/roken/getarg.ho \
../heimdal/lib/roken/get_window_size.ho \
-   ../heimdal/lib/roken/getprogname.ho \
../heimdal/lib/roken/strupr.ho \
../heimdal/lib/roken/setprogname.ho \
replace.ho \
../lib/replace/snprintf.ho \
../lib/replace/replace.ho
-PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX
+PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX 
HEIMDAL_ROKEN_GETPROGNAME_HOST
 # End BINARY compile_et
 ###

svn commit: samba r15263 - in branches/SAMBA_4_0/source: build/smb_build heimdal_build

2006-04-25 Thread jelmer

Author: jelmer
Date: 2006-04-26 00:46:10 + (Wed, 26 Apr 2006)
New Revision: 15263

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

Log:
Remove another use of patsubst (should make tru64 happy)

Added:
   branches/SAMBA_4_0/source/heimdal_build/hcrypto-deps.pl
Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===
--- branches/SAMBA_4_0/source/build/smb_build/TODO  2006-04-26 00:11:33 UTC 
(rev 15262)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO  2006-04-26 00:46:10 UTC 
(rev 15263)
@@ -1,3 +1,4 @@
+- let the build system implement some make 
functions($(patsubst),$(wildcard),...)
 - make --enable-dso the default
  - fix module loading for selftest during non-developer builds
 - clearer distinction between dcerpc and ndr. seperate interface tables?

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-26 00:11:33 UTC 
(rev 15262)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-04-26 00:46:10 UTC 
(rev 15263)
@@ -455,7 +455,7 @@
 heimdal/lib/roken/vis.h: heimdal/lib/roken/vis.hin
 heimdal/lib/roken/err.h: heimdal/lib/roken/err.hin
 
-$(patsubst heimdal/lib/des/%.h,heimdal/lib/des/hcrypto/%.h,$(wildcard 
heimdal/lib/des/*.h)): heimdal/lib/des/hcrypto
+include hcrypto-deps.pl heimdal/lib/des/*.h|
 
 heimdal/lib/des/hcrypto: 
rm -f $@; ln -s ./../des $@

Added: branches/SAMBA_4_0/source/heimdal_build/hcrypto-deps.pl
===
--- branches/SAMBA_4_0/source/heimdal_build/hcrypto-deps.pl 2006-04-26 
00:11:33 UTC (rev 15262)
+++ branches/SAMBA_4_0/source/heimdal_build/hcrypto-deps.pl 2006-04-26 
00:46:10 UTC (rev 15263)
@@ -0,0 +1,9 @@
+#!/usr/bin/perl
+use strict;
+
+foreach (@ARGV) {
+   my $old = $_;
+   my $new = $old; $new =~ s/des/des\/hcrypto/g;
+   my $dir = $old; 
+   print $new: $old heimdal/lib/des/hcrypto\n;
+}


Property changes on: branches/SAMBA_4_0/source/heimdal_build/hcrypto-deps.pl
___
Name: svn:executable
   + *

38 matches

Mail list logo