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

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:57:09 + (Thu, 10 Feb 2005)
New Revision: 5310

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5310

Log:
allow for rounding errors in the sleep test

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/echo.c
===
--- branches/SAMBA_4_0/source/torture/rpc/echo.c2005-02-10 07:43:39 UTC 
(rev 5309)
+++ branches/SAMBA_4_0/source/torture/rpc/echo.c2005-02-10 07:57:09 UTC 
(rev 5310)
@@ -263,7 +263,7 @@
r[i].out.result, 
r[i].in.seconds, (uint_t)diff[i].tv_sec);
ret = False;
} else {
-   if (r[i].out.result > diff[i].tv_sec) {
+   if (r[i].out.result > diff[i].tv_sec+1) 
{
printf("Failed - Sleeped for %u 
seconds (but reply takes only %u seconds)\n", 
r[i].out.result, 
(uint_t)diff[i].tv_sec);
ret = False;

svn commit: samba r5309 - in branches/SAMBA_4_0/source: dsdb/common include libcli/auth ntvfs/common rpc_server/samr

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:43:39 + (Thu, 10 Feb 2005)
New Revision: 5309

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5309

Log:
removed ads.h from includes.h
Modified:
   branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
   branches/SAMBA_4_0/source/include/ads.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/libcli/auth/kerberos.c
   branches/SAMBA_4_0/source/ntvfs/common/sidmap.c
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
===
--- branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c2005-02-10 
07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c2005-02-10 
07:43:39 UTC (rev 5309)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "ads.h"
 
 /* 
 translated the ACB_CTRL Flags to UserFlags (userAccountControl) 

Modified: branches/SAMBA_4_0/source/include/ads.h
===
--- branches/SAMBA_4_0/source/include/ads.h 2005-02-10 07:39:14 UTC (rev 
5308)
+++ branches/SAMBA_4_0/source/include/ads.h 2005-02-10 07:43:39 UTC (rev 
5309)
@@ -20,7 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
  
-typedef struct {
+typedef struct ads_struct {
void *ld; /* the active ldap structure */
struct ipv4_addr ldap_ip; /* the ip of the active connection, if any */
time_t last_attempt; /* last attempt to reconnect */

Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:39:14 UTC 
(rev 5308)
+++ branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:43:39 UTC 
(rev 5309)
@@ -132,7 +132,6 @@
 #include "smb_interfaces.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-#include "ads.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), 
count)

Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:39:14 UTC (rev 
5308)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:43:39 UTC (rev 
5309)
@@ -175,3 +175,5 @@
 struct nbtd_interface;
 
 struct mutex_ops;
+
+struct ads_struct;

Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos.c
===
--- branches/SAMBA_4_0/source/libcli/auth/kerberos.c2005-02-10 07:39:14 UTC 
(rev 5308)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos.c2005-02-10 07:43:39 UTC 
(rev 5309)
@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "secrets.h"
 #include "pstring.h"
+#include "ads.h"
 
 #ifdef HAVE_KRB5
 
@@ -149,7 +150,7 @@
 }
 
 /* run kinit to setup our ccache */
-int ads_kinit_password(ADS_STRUCT *ads)
+int ads_kinit_password(struct ads_struct *ads)
 {
char *s;
int ret;

Modified: branches/SAMBA_4_0/source/ntvfs/common/sidmap.c
===
--- branches/SAMBA_4_0/source/ntvfs/common/sidmap.c 2005-02-10 07:39:14 UTC 
(rev 5308)
+++ branches/SAMBA_4_0/source/ntvfs/common/sidmap.c 2005-02-10 07:43:39 UTC 
(rev 5309)
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "ads.h"
 
 /*
   these are used for the fallback local uid/gid to sid mapping

Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2005-02-10 
07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c 2005-02-10 
07:43:39 UTC (rev 5309)
@@ -29,6 +29,7 @@
 #include "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
+#include "ads.h"
 
 
 /*

Modified: branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
===
--- branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c   2005-02-10 
07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c   2005-02-10 
07:43:39 UTC (rev 5309)
@@ -28,6 +28,7 @@
 #include "system/time.h"
 #include "lib/crypto/crypto.h"
 #include "lib/ldb/include/ldb.h"
+#include "ads.h"
 
 /* 
   samr_ChangePasswordUser

svn commit: samba r5308 - in branches/SAMBA_4_0/source: client include lib lib/netif libcli/ldap param rpc_server/netlogon smb_server torture torture/rpc utils/net

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:39:14 + (Thu, 10 Feb 2005)
New Revision: 5308

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5308

Log:
trimmed back a lot of the old macros from smb_macros.h
Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/include/smb_macros.h
   branches/SAMBA_4_0/source/lib/netif/interface.c
   branches/SAMBA_4_0/source/lib/pidfile.c
   branches/SAMBA_4_0/source/lib/util.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
   branches/SAMBA_4_0/source/smb_server/conn.c
   branches/SAMBA_4_0/source/smb_server/service.c
   branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
   branches/SAMBA_4_0/source/torture/torture.c
   branches/SAMBA_4_0/source/utils/net/net_time.c


Changeset:
Sorry, the patch is too large (325 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5308

svn commit: samba r5307 - in branches/SAMBA_4_0/source: dsdb/samdb include ldap_server lib lib/registry ntvfs/common ntvfs/posix passdb rpc_server/lsa rpc_server/netlogon

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:22:25 + (Thu, 10 Feb 2005)
New Revision: 5307

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5307

Log:
removed db_wrap.h from includes.h
Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c
   branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
   branches/SAMBA_4_0/source/lib/db_wrap.c
   branches/SAMBA_4_0/source/lib/gencache.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c
   branches/SAMBA_4_0/source/ntvfs/common/brlock.c
   branches/SAMBA_4_0/source/ntvfs/common/opendb.c
   branches/SAMBA_4_0/source/ntvfs/posix/xattr_tdb.c
   branches/SAMBA_4_0/source/passdb/secrets.c
   branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
   branches/SAMBA_4_0/source/rpc_server/netlogon/schannel_state.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2005-02-10 07:18:00 UTC 
(rev 5306)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c2005-02-10 07:22:25 UTC 
(rev 5307)
@@ -25,6 +25,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 /*
   connect to the SAM database

Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:18:00 UTC 
(rev 5306)
+++ branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:22:25 UTC 
(rev 5307)
@@ -113,7 +113,6 @@
 #include "lib/talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"
-#include "db_wrap.h"
 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"

Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:18:00 UTC (rev 
5306)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:22:25 UTC (rev 
5307)
@@ -136,6 +136,7 @@
 
 struct ldb_val;
 struct ldb_message;
+struct ldb_context;
 
 struct dom_sid;
 struct security_token;

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c 2005-02-10 
07:18:00 UTC (rev 5306)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c 2005-02-10 
07:22:25 UTC (rev 5307)
@@ -27,6 +27,7 @@
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "db_wrap.h"
 
 
 #define VALID_DN_SYNTAX(dn,i) do {\

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2005-02-10 
07:18:00 UTC (rev 5306)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c 2005-02-10 
07:22:25 UTC (rev 5307)
@@ -23,6 +23,7 @@
 #include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 #define VALID_DN_SYNTAX(dn,i) do {\
if (!(dn)) {\

Modified: branches/SAMBA_4_0/source/lib/db_wrap.c
===
--- branches/SAMBA_4_0/source/lib/db_wrap.c 2005-02-10 07:18:00 UTC (rev 
5306)
+++ branches/SAMBA_4_0/source/lib/db_wrap.c 2005-02-10 07:22:25 UTC (rev 
5307)
@@ -31,6 +31,7 @@
 #include "dlinklist.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 static struct ldb_wrap *ldb_list;
 static struct tdb_wrap *tdb_list;

Modified: branches/SAMBA_4_0/source/lib/gencache.c
===
--- branches/SAMBA_4_0/source/lib/gencache.c2005-02-10 07:18:00 UTC (rev 
5306)
+++ branches/SAMBA_4_0/source/lib/gencache.c2005-02-10 07:22:25 UTC (rev 
5307)
@@ -25,6 +25,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "db_wrap.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB

Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c
===
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c2005-02-10 
07:18:00 UTC (rev 5306)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c2005-02-10 
07:22:25 UTC (rev 5307)
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "lib/ldb/include/ldb.h"
+#include "db_wrap.h"
 
 struct ldb_key_data 
 {

Modified: branches/SAMBA_4_0/source/ntvfs/common/brlock.c
===
--- branches/SAMBA_4_0/source/ntvfs

svn commit: samba r5306 - in branches/SAMBA_4_0/source: include lib smbd

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:18:00 + (Thu, 10 Feb 2005)
New Revision: 5306

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5306

Log:
removed all the unused mutex functions from mutex.c. When (if?) we
decide to reinstate the mutex code for the threads process model, I'd
like to do it a little differently. At least this gets it out of
includes.h for now.


Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/mutex.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/lib/mutex.c
   branches/SAMBA_4_0/source/smbd/process_thread.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:08:40 UTC 
(rev 5305)
+++ branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:18:00 UTC 
(rev 5306)
@@ -124,7 +124,6 @@
 #include "smb.h"
 #include "byteorder.h"
 #include "module.h"
-#include "mutex.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"

Modified: branches/SAMBA_4_0/source/include/mutex.h
===
--- branches/SAMBA_4_0/source/include/mutex.h   2005-02-10 07:08:40 UTC (rev 
5305)
+++ branches/SAMBA_4_0/source/include/mutex.h   2005-02-10 07:18:00 UTC (rev 
5306)
@@ -21,16 +21,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* To add a new mutex, add it to enum mutex_id
- */
-enum mutex_id { MUTEX_SMBD,/* global smbd lock */
-   MUTEX_TALLOC,   /* global talloc.c lock */
-   MUTEX_DEBUG,/* global debug.c lock */
-   MUTEX_TANK, /* vfs_tank lock */
-
-   MUTEX_MAX /* this MUST be kept last */
-};
-
 /* To add a new read/write lock, add it to enum rwlock_id
  */
 enum rwlock_id { RWLOCK_SMBD,  /* global smbd lock */
@@ -55,7 +45,7 @@
 
 /* this null typedef ensures we get the types right and avoids the
pitfalls of void* */
-typedef struct {
+typedef struct smb_mutex {
void *mutex;
 } smb_mutex_t;
 typedef struct {

Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:08:40 UTC (rev 
5305)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:18:00 UTC (rev 
5306)
@@ -172,3 +172,5 @@
 
 struct nbtd_server;
 struct nbtd_interface;
+
+struct mutex_ops;

Modified: branches/SAMBA_4_0/source/lib/mutex.c
===
--- branches/SAMBA_4_0/source/lib/mutex.c   2005-02-10 07:08:40 UTC (rev 
5305)
+++ branches/SAMBA_4_0/source/lib/mutex.c   2005-02-10 07:18:00 UTC (rev 
5306)
@@ -19,100 +19,17 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "includes.h"
+#include "mutex.h"
 
-static smb_mutex_t mutex_list[MUTEX_MAX];
-
 /* the registered mutex handlers */
 static struct {
const char *name;
struct mutex_ops ops;
 } mutex_handlers;
 
-int smb_mutex_lock_by_id(enum mutex_id id, const char *name)
-{
-   return smb_mutex_lock(&mutex_list[id], name);
-}
-
-int smb_mutex_unlock_by_id(enum mutex_id id, const char *name)
-{
-   return smb_mutex_unlock(&mutex_list[id], name);
-}
-
-int smb_mutex_init(smb_mutex_t *mutex, const char *name)
-{
-   if (mutex_handlers.ops.mutex_init) {
-   return mutex_handlers.ops.mutex_init(mutex, name);
-   }
-   return 0;
-}
-
-int smb_mutex_destroy(smb_mutex_t *mutex, const char *name)
-{
-   if (mutex_handlers.ops.mutex_destroy) {
-   return mutex_handlers.ops.mutex_destroy(mutex, name);
-   }
-   return 0;
-}
-
-int smb_mutex_lock(smb_mutex_t *mutex, const char *name)
-{
-   if (mutex_handlers.ops.mutex_lock) {
-   return mutex_handlers.ops.mutex_lock(mutex, name);
-   }
-   return 0;
-}
-
-int smb_mutex_unlock(smb_mutex_t *mutex, const char *name)
-{
-   if (mutex_handlers.ops.mutex_unlock) {
-   return mutex_handlers.ops.mutex_unlock(mutex, name);
-   }
-   return 0;
-}
-
 /* read/write lock routines */
 
-int smb_rwlock_init(smb_rwlock_t *rwlock, const char *name)
-{
-   if (mutex_handlers.ops.rwlock_init) {
-   return mutex_handlers.ops.rwlock_init(rwlock, name);
-   }
-   return 0;
-}
 
-int smb_rwlock_destroy(smb_rwlock_t *rwlock, const char *name)
-{
-   if (mutex_handlers.ops.rwlock_destroy) {
-   return mutex_handlers.ops.rwlock_destroy(rwlock, name);
-   }
-   return 0;
-}
-
-int smb_rwlock_lock_write(smb_rwlock_t *rwlock, const char *name)
-{
-   if (mutex_handlers.ops.rwlock_lock_write) {
-   return mutex_handlers.ops.rwlock_lock_write(rwlock, name);
-

svn commit: samba r5305 - in branches/SAMBA_4_0/source: include ldap_server libcli/ldap torture/ldap

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 07:08:40 + (Thu, 10 Feb 2005)
New Revision: 5305

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5305

Log:
removed libcli/ldap/ldap.h from includes.h
Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
   branches/SAMBA_4_0/source/ldap_server/ldap_bind.c
   branches/SAMBA_4_0/source/ldap_server/ldap_server.h
   branches/SAMBA_4_0/source/libcli/ldap/config.mk
   branches/SAMBA_4_0/source/libcli/ldap/ldap.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap.h
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_ldif.c
   branches/SAMBA_4_0/source/torture/ldap/basic.c
   branches/SAMBA_4_0/source/torture/ldap/common.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2005-02-10 06:59:29 UTC 
(rev 5304)
+++ branches/SAMBA_4_0/source/include/includes.h2005-02-10 07:08:40 UTC 
(rev 5305)
@@ -122,7 +122,6 @@
 #include "enums.h"
 #include "smb_macros.h"
 #include "smb.h"
-#include "libcli/ldap/ldap.h"
 #include "byteorder.h"
 #include "module.h"
 #include "mutex.h"

Modified: branches/SAMBA_4_0/source/include/structs.h
===
--- branches/SAMBA_4_0/source/include/structs.h 2005-02-10 06:59:29 UTC (rev 
5304)
+++ branches/SAMBA_4_0/source/include/structs.h 2005-02-10 07:08:40 UTC (rev 
5305)
@@ -74,6 +74,8 @@
 
 struct ldapsrv_call;
 struct ldapsrv_connection;
+struct ldap_connection;
+struct ldap_message;
 struct rw_buffer;
 struct registry_context;
 struct registry_key;

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_backend.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2005-02-10 
06:59:29 UTC (rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_backend.c2005-02-10 
07:08:40 UTC (rev 5305)
@@ -21,9 +21,10 @@
 #include "includes.h"
 #include "ldap_server/ldap_server.h"
 #include "dlinklist.h"
+#include "libcli/ldap/ldap.h"
 
 
-struct ldapsrv_reply *ldapsrv_init_reply(struct ldapsrv_call *call, enum 
ldap_request_tag type)
+struct ldapsrv_reply *ldapsrv_init_reply(struct ldapsrv_call *call, uint8_t 
type)
 {
struct ldapsrv_reply *reply;
 
@@ -47,7 +48,7 @@
return NT_STATUS_OK;
 }
 
-struct ldapsrv_partition *ldapsrv_get_partition(struct ldapsrv_connection 
*conn, const char *dn, enum ldap_scope scope)
+struct ldapsrv_partition *ldapsrv_get_partition(struct ldapsrv_connection 
*conn, const char *dn, uint8_t scope)
 {
if (scope == LDAP_SEARCH_SCOPE_BASE
&& strcasecmp("", dn) == 0) {

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_bind.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_bind.c   2005-02-10 06:59:29 UTC 
(rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_bind.c   2005-02-10 07:08:40 UTC 
(rev 5305)
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "ldap_server/ldap_server.h"
 #include "auth/auth.h"
+#include "libcli/ldap/ldap.h"
 
 static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
 {

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.h
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-02-10 06:59:29 UTC 
(rev 5304)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-02-10 07:08:40 UTC 
(rev 5305)
@@ -19,6 +19,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "libcli/ldap/ldap.h"
+
 struct rw_buffer {
uint8_t *data;
size_t ofs, length;

Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk
===
--- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-02-10 06:59:29 UTC 
(rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2005-02-10 07:08:40 UTC 
(rev 5305)
@@ -4,5 +4,6 @@
 ADD_OBJ_FILES = libcli/ldap/ldap.o \
libcli/ldap/ldap_client.o \
libcli/ldap/ldap_ldif.o
+NOPROTO=YES
 # End SUBSYSTEM LIBCLI_LDAP
 #

Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap.c2005-02-10 06:59:29 UTC 
(rev 5304)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap.c2005-02-10 07:08:40 UTC 
(rev 5305)
@@ -27,6 +27,7 @@
 #include "system/iconv.h"
 #include "system/filesys.h"
 #include "asn_1.h"
+#include "libcli/ldap/ldap.h"
 
 /
  *

Modified: branches/SAMBA_4_0/source/libcli/ldap

svn commit: samba r5304 - in branches/SAMBA_4_0/source: include ldap_server lib/messaging lib/socket libcli/nbt libcli/raw librpc/rpc nbt_server rpc_server smbd torture/local torture/nbt utils winbind

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 06:59:29 + (Thu, 10 Feb 2005)
New Revision: 5304

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5304

Log:
removed lib/socket/socket.h from includes.h
Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/ldap_server/ldap_server.c
   branches/SAMBA_4_0/source/lib/messaging/messaging.c
   branches/SAMBA_4_0/source/lib/socket/access.c
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/lib/socket/socket.c
   branches/SAMBA_4_0/source/lib/socket/socket.h
   branches/SAMBA_4_0/source/lib/socket/socket_ipv4.c
   branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c
   branches/SAMBA_4_0/source/lib/socket/socket_unix.c
   branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
   branches/SAMBA_4_0/source/libcli/raw/clisocket.c
   branches/SAMBA_4_0/source/libcli/raw/clitransport.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
   branches/SAMBA_4_0/source/nbt_server/interfaces.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
   branches/SAMBA_4_0/source/smbd/process_model.h
   branches/SAMBA_4_0/source/smbd/service_stream.c
   branches/SAMBA_4_0/source/torture/local/socket.c
   branches/SAMBA_4_0/source/torture/nbt/register.c
   branches/SAMBA_4_0/source/torture/nbt/wins.c
   branches/SAMBA_4_0/source/utils/nmblookup.c
   branches/SAMBA_4_0/source/winbind/wb_server.c


Changeset:
Sorry, the patch is too large (366 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5304

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

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 06:45:13 + (Thu, 10 Feb 2005)
New Revision: 5303

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5303

Log:
fixed build of gconf registry backend
Modified:
   branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf.c
===
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf.c  2005-02-10 
06:36:30 UTC (rev 5302)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_gconf.c  2005-02-10 
06:45:13 UTC (rev 5303)
@@ -150,7 +150,7 @@
return WERR_OK;
 }
 
-static WERROR gconf_set_value(struct registry_key *key, const char *valname, 
uint32 type, void *data, int len)
+static WERROR gconf_set_value(struct registry_key *key, const char *valname, 
uint32_t type, void *data, int len)
 {
GError *error = NULL;
char *valpath;

svn commit: samba r5302 - in branches/SAMBA_4_0/source: client lib librpc/rpc ntvfs/simple param rpc_server smbd winbind

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 06:36:30 + (Thu, 10 Feb 2005)
New Revision: 5302

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5302

Log:
fixed a compilation problem on solaris caused by the recent include
changes






Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/client/smbmount.c
   branches/SAMBA_4_0/source/lib/util.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c
   branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
   branches/SAMBA_4_0/source/smbd/server.c
   branches/SAMBA_4_0/source/winbind/wb_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===
--- branches/SAMBA_4_0/source/client/client.c   2005-02-10 05:29:38 UTC (rev 
5301)
+++ branches/SAMBA_4_0/source/client/client.c   2005-02-10 06:36:30 UTC (rev 
5302)
@@ -929,7 +929,7 @@
strlower(discard_const_p(char, finfo->name));
}

-   if (!directory_exist(finfo->name,NULL) && 
+   if (!directory_exist(finfo->name) && 
mkdir(finfo->name,0777) != 0) {
d_printf("failed to create directory %s\n",finfo->name);
pstrcpy(cur_dir,saved_curdir);
@@ -1301,15 +1301,11 @@

dos_clean_name(rname);
 
-   {
-   struct stat st;
-   /* allow '-' to represent stdin
-  jdblair, 24.jun.98 */
-   if (!file_exist(lname,&st) &&
-   (strcmp(lname,"-"))) {
-   d_printf("%s does not exist\n",lname);
-   return 1;
-   }
+   /* allow '-' to represent stdin
+  jdblair, 24.jun.98 */
+   if (!file_exist(lname) && (strcmp(lname,"-"))) {
+   d_printf("%s does not exist\n",lname);
+   return 1;
}
 
return do_put(rname, lname, False);
@@ -2479,7 +2475,6 @@
pstring remote_name;
fstring buf;
char *p = buf;
-   struct stat st;

pstrcpy(remote_name, cur_dir);
pstrcat(remote_name, "\\");
@@ -2490,7 +2485,7 @@
}
pstrcpy(local_name, p);
   
-   if (!file_exist(local_name, &st)) {
+   if (!file_exist(local_name)) {
d_printf("%s does not exist\n", local_name);
return 1;
}

Modified: branches/SAMBA_4_0/source/client/smbmount.c
===
--- branches/SAMBA_4_0/source/client/smbmount.c 2005-02-10 05:29:38 UTC (rev 
5301)
+++ branches/SAMBA_4_0/source/client/smbmount.c 2005-02-10 06:36:30 UTC (rev 
5302)
@@ -496,7 +496,7 @@
 
asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR);

-   if (file_exist(smbmnt_path, NULL)) {
+   if (file_exist(smbmnt_path)) {
execv(smbmnt_path, args);
fprintf(stderr,
"smbfs/init_mount: execv of %s failed. Error 
was %s.",

Modified: branches/SAMBA_4_0/source/lib/util.c
===
--- branches/SAMBA_4_0/source/lib/util.c2005-02-10 05:29:38 UTC (rev 
5301)
+++ branches/SAMBA_4_0/source/lib/util.c2005-02-10 06:36:30 UTC (rev 
5302)
@@ -44,16 +44,15 @@
 /***
  Check if a file exists - call vfs_file_exist for samba files.
 /
-BOOL file_exist(const char *fname, struct stat *sbuf)
+BOOL file_exist(const char *fname)
 {
struct stat st;
-   if (!sbuf)
-   sbuf = &st;
-  
-   if (stat(fname,sbuf) != 0) 
-   return(False);
 
-   return((S_ISREG(sbuf->st_mode)) || (S_ISFIFO(sbuf->st_mode)));
+   if (stat(fname, &st) != 0) {
+   return False;
+   }
+
+   return ((S_ISREG(st.st_mode)) || (S_ISFIFO(st.st_mode)));
 }
 
 /***
@@ -74,18 +73,16 @@
  Check if a directory exists.
 /
 
-BOOL directory_exist(const char *dname,struct stat *st)
+BOOL directory_exist(const char *dname)
 {
-   struct stat st2;
+   struct stat st;
BOOL ret;
 
-   if (!st)
-   st = &st2;
+   if (stat(dname,&st) != 0) {
+   return False;
+   }
 
-   if (stat(dname,st) != 0) 
-   return(False);
-
-   ret = S_ISDIR(st->st_mode);
+   ret = S_ISDIR(st.st_mode);
if(!ret)
errno = ENOTDIR;
return ret;
@@ -687,7 +684,7 @@
dname = talloc_strdup(mem_ctx, lp_lockdir());
trim_string(dname,"","/");

-   if (

svn commit: samba r5301 - in branches/SAMBA_4_0/source/smbd: .

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 05:29:38 + (Thu, 10 Feb 2005)
New Revision: 5301

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5301

Log:
fixed pthreads build
Modified:
   branches/SAMBA_4_0/source/smbd/process_thread.c


Changeset:
Modified: branches/SAMBA_4_0/source/smbd/process_thread.c
===
--- branches/SAMBA_4_0/source/smbd/process_thread.c 2005-02-10 05:22:53 UTC 
(rev 5300)
+++ branches/SAMBA_4_0/source/smbd/process_thread.c 2005-02-10 05:29:38 UTC 
(rev 5301)
@@ -29,6 +29,7 @@
 #include 
 #endif
 #include "system/wait.h"
+#include "system/filesys.h"
 #include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"

svn commit: samba r5300 - in branches/SAMBA_4_0/source: gtk/tools lib/tdb/tools libcli/auth rpc_server/remote utils

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 05:22:53 + (Thu, 10 Feb 2005)
New Revision: 5300

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5300

Log:
more uint32 and system/filesys.h build fixes when developer mode is enabled




Modified:
   branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
   branches/SAMBA_4_0/source/libcli/auth/kerberos.c
   branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c
   branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c
   branches/SAMBA_4_0/source/utils/ntlm_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
===
--- branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2005-02-10 05:15:37 UTC 
(rev 5299)
+++ branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c 2005-02-10 05:22:53 UTC 
(rev 5300)
@@ -41,7 +41,7 @@
struct atsvc_JobEnum r;
struct atsvc_enum_ctr ctr;
int i;
-   uint32 resume_handle = 0;
+   uint32_t resume_handle = 0;
 
 gtk_list_store_clear(store_jobs);
 

Modified: branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c
===
--- branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c   2005-02-10 05:15:37 UTC 
(rev 5299)
+++ branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c   2005-02-10 05:22:53 UTC 
(rev 5300)
@@ -16,6 +16,7 @@
 #else
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 
 #endif

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c
===
--- branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c   2005-02-10 
05:15:37 UTC (rev 5299)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_gssapi.c   2005-02-10 
05:22:53 UTC (rev 5300)
@@ -316,7 +316,7 @@
 }
 
 static BOOL gensec_gssapi_have_feature(struct gensec_security 
*gensec_security, 
-  uint32 feature) 
+  uint32_t feature) 
 {
struct gensec_gssapi_state *gensec_gssapi_state = 
gensec_security->private_data;
if (feature & GENSEC_FEATURE_SIGN) {

Modified: branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c
===
--- branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c 2005-02-10 05:15:37 UTC 
(rev 5299)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec_krb5.c 2005-02-10 05:22:53 UTC 
(rev 5300)
@@ -489,7 +489,7 @@
{
krb5_data inbuf;
krb5_ap_rep_enc_part *repl = NULL;
-   uint8 tok_id[2];
+   uint8_t tok_id[2];
DATA_BLOB unwrapped_in;
 
if (!gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, 
&unwrapped_in, tok_id)) {
@@ -525,7 +525,7 @@
char *principal;
DATA_BLOB unwrapped_in;
DATA_BLOB unwrapped_out = data_blob(NULL, 0);
-   uint8 tok_id[2];
+   uint8_t tok_id[2];
 
if (!in.data) {
*out = unwrapped_out;
@@ -689,7 +689,7 @@
 }
 
 static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security,
-uint32 feature)
+uint32_t feature)
 {
if (feature & GENSEC_FEATURE_SESSION_KEY) {
return True;

Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos.c
===
--- branches/SAMBA_4_0/source/libcli/auth/kerberos.c2005-02-10 05:15:37 UTC 
(rev 5299)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos.c2005-02-10 05:22:53 UTC 
(rev 5300)
@@ -26,6 +26,7 @@
 #include "libcli/auth/kerberos.h"
 #include "system/time.h"
 #include "secrets.h"
+#include "pstring.h"
 
 #ifdef HAVE_KRB5
 

Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c
===
--- branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c 2005-02-10 
05:15:37 UTC (rev 5299)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos_verify.c 2005-02-10 
05:22:53 UTC (rev 5300)
@@ -28,6 +28,7 @@
 #include "asn_1.h"
 #include "lib/ldb/include/ldb.h"
 #include "secrets.h"
+#include "pstring.h"
 
 #ifdef HAVE_KRB5
 

Modified: branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c
===
--- branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c 2005-02-10 
05:15:37 UTC (rev 5299)
+++ branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c 2005-02-10 
05:22:53 UTC (rev 5300)
@@ -164,7 +164,7 @@
 static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const 
struct dcesrv_endpoint_server

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

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 05:15:37 + (Thu, 10 Feb 2005)
New Revision: 5299

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5299

Log:
fixed an include ordering problem



Modified:
   branches/SAMBA_4_0/source/lib/unix_privs.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/unix_privs.c
===
--- branches/SAMBA_4_0/source/lib/unix_privs.c  2005-02-10 05:09:35 UTC (rev 
5298)
+++ branches/SAMBA_4_0/source/lib/unix_privs.c  2005-02-10 05:15:37 UTC (rev 
5299)
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "system/passwd.h"
-#include "system/filesys.h"
 
 /*
   there are times when smbd needs to temporarily gain root privileges

svn commit: samba r5298 - in branches/SAMBA_4_0/source: . auth build/pidl dsdb/samdb include intl lib lib/cmdline lib/dcom/common lib/events lib/ldb/ldb_tdb lib/ldb/tools lib/messaging lib/registry lib/socket lib/tdb/common lib/tdb/tools libcli/auth libcli/ldap libcli/raw libcli/resolve libcli/util libnet librpc/rpc nsswitch ntvfs/common ntvfs/ipc ntvfs/nbench ntvfs/posix ntvfs/simple ntvfs/unixuid passdb rpc_server rpc_server/dcom rpc_server/drsuapi rpc_server/dssetup rpc_server/echo rpc_server/netlogon rpc_server/samr rpc_server/winreg smbd torture torture/basic torture/local torture/nbench torture/rap torture/raw torture/rpc utils utils/net winbind

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 05:09:35 + (Thu, 10 Feb 2005)
New Revision: 5298

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5298

Log:
 - got rid of pstring.h from includes.h. This at least makes it a bit
   less likely that anyone will use pstring for new code

 - got rid of winbind_client.h from includes.h. This one triggered a
   huge change, as winbind_client.h was including system/filesys.h and
   defining the old uint32 and uint16 types, as well as its own
   pstring and fstring.

  

Modified:
   branches/SAMBA_4_0/source/auth/auth_developer.c
   branches/SAMBA_4_0/source/auth/auth_sam.c
   branches/SAMBA_4_0/source/auth/auth_winbind.c
   branches/SAMBA_4_0/source/build/pidl/server.pm
   branches/SAMBA_4_0/source/build/pidl/stub.pm
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
   branches/SAMBA_4_0/source/dynconfig.c
   branches/SAMBA_4_0/source/include/dynconfig.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/pstring.h
   branches/SAMBA_4_0/source/include/rap.h
   branches/SAMBA_4_0/source/intl/lang_tdb.c
   branches/SAMBA_4_0/source/lib/charcnv.c
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.h
   branches/SAMBA_4_0/source/lib/cmdline/readline.c
   branches/SAMBA_4_0/source/lib/dcom/common/main.c
   branches/SAMBA_4_0/source/lib/debug.c
   branches/SAMBA_4_0/source/lib/events/events.c
   branches/SAMBA_4_0/source/lib/fault.c
   branches/SAMBA_4_0/source/lib/gencache.c
   branches/SAMBA_4_0/source/lib/genrand.c
   branches/SAMBA_4_0/source/lib/iconv.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbdel.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbmodify.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbrename.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c
   branches/SAMBA_4_0/source/lib/messaging/messaging.c
   branches/SAMBA_4_0/source/lib/pidfile.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_dir.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_ldb.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_rpc.c
   branches/SAMBA_4_0/source/lib/registry/reg_samba.c
   branches/SAMBA_4_0/source/lib/select.c
   branches/SAMBA_4_0/source/lib/socket/socket.c
   branches/SAMBA_4_0/source/lib/socket/socket_ipv4.c
   branches/SAMBA_4_0/source/lib/socket/socket_ipv6.c
   branches/SAMBA_4_0/source/lib/socket/socket_unix.c
   branches/SAMBA_4_0/source/lib/system.c
   branches/SAMBA_4_0/source/lib/tdb/common/spinlock.c
   branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c
   branches/SAMBA_4_0/source/lib/unix_privs.c
   branches/SAMBA_4_0/source/lib/username.c
   branches/SAMBA_4_0/source/lib/util.c
   branches/SAMBA_4_0/source/lib/util_file.c
   branches/SAMBA_4_0/source/lib/util_sock.c
   branches/SAMBA_4_0/source/lib/util_str.c
   branches/SAMBA_4_0/source/libcli/auth/gensec_ntlmssp.c
   branches/SAMBA_4_0/source/libcli/auth/ntlmssp.c
   branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c
   branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c
   branches/SAMBA_4_0/source/libcli/auth/spnego.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap.c
   branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
   branches/SAMBA_4_0/source/libcli/raw/clisession.c
   branches/SAMBA_4_0/source/libcli/resolve/host.c
   branches/SAMBA_4_0/source/libcli/util/doserr.c
   branches/SAMBA_4_0/source/libcli/util/nterr.c
   branches/SAMBA_4_0/source/libnet/libnet_join.c
   branches/SAMBA_4_0/source/libnet/libnet_join.h
   branches/SAMBA_4_0/source/libnet/libnet_rpc.h
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/nsswitch/wb_common.c
   branches/SAMBA_4_0/source/ntvfs/common/brlock.c
   branches/SAMBA_4_0/source/ntvfs/common/opendb.c
   branches/SAMBA_4_0/source/ntvfs/common/sidmap.c
   branches/SAMBA_4_0/source/ntvfs/ipc/ipc_rap.c
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_search.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_streams.c
   branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.h
   branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
   branches/SAMBA_4_0/source/ntvfs/simple/svfs_util.c
   branches/SAMBA_4_0/source/ntvfs/simple/vfs_simple.c
   branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
   branches/SAMBA_4_0/source/passdb/secrets.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
   branches/SAMBA_4_0/source/rpc_server/dcom/rodb.c
   branches/SAMBA_4_0/source/rpc_server/d

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

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 05:06:41 + (Thu, 10 Feb 2005)
New Revision: 5297

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5297

Log:
ensure pstring is not in the generated prototypes 


Modified:
   branches/SAMBA_4_0/source/lib/charcnv.c
   branches/SAMBA_4_0/source/lib/util.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/charcnv.c
===
--- branches/SAMBA_4_0/source/lib/charcnv.c 2005-02-10 03:48:43 UTC (rev 
5296)
+++ branches/SAMBA_4_0/source/lib/charcnv.c 2005-02-10 05:06:41 UTC (rev 
5297)
@@ -508,11 +508,6 @@
return src_len;
 }
 
-ssize_t pull_ucs2_pstring(char *dest, const void *src)
-{
-   return pull_ucs2(dest, src, sizeof(pstring), -1, STR_TERMINATE);
-}
-
 /**
  * Copy a string from a UCS2 src to a unix char * destination, allocating a 
buffer using talloc
  *

Modified: branches/SAMBA_4_0/source/lib/util.c
===
--- branches/SAMBA_4_0/source/lib/util.c2005-02-10 03:48:43 UTC (rev 
5296)
+++ branches/SAMBA_4_0/source/lib/util.c2005-02-10 05:06:41 UTC (rev 
5297)
@@ -310,7 +310,7 @@
  Get my own domain name.
 /
 
-BOOL get_mydomname(fstring my_domname)
+BOOL get_mydomname(char *my_domname)
 {
pstring hostname;
char *p;

svn commit: samba r5296 - in branches/SAMBA_4_0/source: include intl lib lib/events lib/ldb/ldb_tdb lib/tdb/common lib/tdb/include lib/tdb/tools ntvfs/common ntvfs/posix param passdb smbd torture/basic

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 03:48:43 + (Thu, 10 Feb 2005)
New Revision: 5296

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5296

Log:
- only include the tdb headers where they are needed

- removed the u32 hack in events.c as I think this was only needed as
  tdb.h defines u32. Metze, can you check that this hack is indeed no
  longer needed on your suse system?

Modified:
   branches/SAMBA_4_0/source/include/db_wrap.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/intl/lang_tdb.c
   branches/SAMBA_4_0/source/lib/db_wrap.c
   branches/SAMBA_4_0/source/lib/events/events.c
   branches/SAMBA_4_0/source/lib/gencache.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
   branches/SAMBA_4_0/source/lib/tdb/common/spinlock.c
   branches/SAMBA_4_0/source/lib/tdb/common/tdb.c
   branches/SAMBA_4_0/source/lib/tdb/common/tdbutil.c
   branches/SAMBA_4_0/source/lib/tdb/include/tdb.h
   branches/SAMBA_4_0/source/lib/tdb/include/tdbutil.h
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbdump.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtest.c
   branches/SAMBA_4_0/source/lib/tdb/tools/tdbtorture.c
   branches/SAMBA_4_0/source/ntvfs/common/brlock.c
   branches/SAMBA_4_0/source/ntvfs/common/opendb.c
   branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
   branches/SAMBA_4_0/source/ntvfs/posix/xattr_tdb.c
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/passdb/secrets.c
   branches/SAMBA_4_0/source/smbd/process_standard.c
   branches/SAMBA_4_0/source/torture/basic/mangle_test.c


Changeset:
Sorry, the patch is too large (342 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5296

svn commit: samba r5295 - in branches/SAMBA_3_0/source/client: .

2005-02-09 Thread jerry 
Author: jerry
Date: 2005-02-10 03:34:25 + (Thu, 10 Feb 2005)
New Revision: 5295

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5295

Log:
fix compile issue with MIT 1.4 due to broken gssapi.h
Modified:
   branches/SAMBA_3_0/source/client/clitar.c


Changeset:
Modified: branches/SAMBA_3_0/source/client/clitar.c
===
--- branches/SAMBA_3_0/source/client/clitar.c   2005-02-10 03:22:47 UTC (rev 
5294)
+++ branches/SAMBA_3_0/source/client/clitar.c   2005-02-10 03:34:25 UTC (rev 
5295)
@@ -87,9 +87,6 @@
 static BOOL tar_excl=True;
 /* use regular expressions for search on file names */
 static BOOL tar_re_search=False;
-#ifdef HAVE_REGEX_H
-regex_t *preg;
-#endif
 /* Do not dump anything, just calculate sizes */
 static BOOL dry_run=False;
 /* Dump files with System attribute */
@@ -797,11 +794,7 @@
DEBUG(5, ("...tar_re_search: %d\n", tar_re_search));
 
if ((!tar_re_search && clipfind(cliplist, clipn, exclaim)) ||
-#ifdef HAVE_REGEX_H
-   (tar_re_search && !regexec(preg, exclaim, 0, 
NULL, 0))) {
-#else
(tar_re_search && mask_match_list(exclaim, 
cliplist, clipn, True))) {
-#endif
DEBUG(3,("Skipping file %s\n", exclaim));
return;
}
@@ -1150,11 +1143,7 @@
/* Well, now we have a header, process the file ...
*/
/* Should we skip the file? We have the long name as well here 
*/
skip = clipn && ((!tar_re_search && clipfind(cliplist, clipn, 
finfo.name) ^ tar_excl) ||
-#ifdef HAVE_REGEX_H
-   (tar_re_search && !regexec(preg, 
finfo.name, 0, NULL, 0)));
-#else
(tar_re_search && 
mask_match_list(finfo.name, cliplist, clipn, True)));
-#endif
 
DEBUG(5, ("Skip = %i, cliplist=%s, file=%s\n", skip, 
(cliplist?cliplist[0]:NULL), finfo.name));
if (skip) {
@@ -1748,25 +1737,6 @@
}
 
if (Optind+1

svn commit: samba r5294 - in branches/SAMBA_4_0/source: include ldap_server lib/netif libcli libcli/nbt libcli/resolve nbt_server rpc_server smb_server torture torture/nbt utils

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 03:22:47 + (Thu, 10 Feb 2005)
New Revision: 5294

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5294

Log:
- added a separate NBT-WINS test for WINS operations (register, refresh, 
release and query)

- change the iface_n_*() functions to return a "const char *" instead of a 
"struct ipv4_addr"
  I think that in general we should move towards "const char *" for
  all IP addresses, as this makes IPv6 much easier, and is also easier
  to debug. Andrew, when you get a chance, could you fix some of the
  auth code to use strings for IPs ?

- return a NTSTATUS error on bad name queries and node status instead
  of using rcode. This makes the calling code simpler.

- added low level name release code in libcli/nbt/

- use a real IP in the register and wins nbt torture tests, as w2k3
  WINS server silently rejects some operations that don't come from the
  IP being used (eg. it says "yes" to a release, but does not in fact
  release the name)




Added:
   branches/SAMBA_4_0/source/libcli/nbt/namerelease.c
   branches/SAMBA_4_0/source/torture/nbt/wins.c
Modified:
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/ldap_server/ldap_server.c
   branches/SAMBA_4_0/source/lib/netif/interface.c
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
   branches/SAMBA_4_0/source/libcli/nbt/namequery.c
   branches/SAMBA_4_0/source/libcli/resolve/bcast.c
   branches/SAMBA_4_0/source/nbt_server/interfaces.c
   branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
   branches/SAMBA_4_0/source/smb_server/smb_server.c
   branches/SAMBA_4_0/source/torture/config.mk
   branches/SAMBA_4_0/source/torture/nbt/register.c
   branches/SAMBA_4_0/source/torture/torture.c
   branches/SAMBA_4_0/source/utils/nmblookup.c


Changeset:
Sorry, the patch is too large (871 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5294

svn commit: samba r5293 - in branches/SAMBA_4_0/source/scripting/swig: .

2005-02-09 Thread tpot 
Author: tpot
Date: 2005-02-10 03:19:21 + (Thu, 10 Feb 2005)
New Revision: 5293

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5293

Log:
Map an empty policy handle to None when creating policy handles, and
refuse to accept None as a policy handle when accepting them.  Now we
don't segfault after running the samr_Shutdown() test.

Modified:
   branches/SAMBA_4_0/source/scripting/swig/dcerpc.i


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/dcerpc.i
===
--- branches/SAMBA_4_0/source/scripting/swig/dcerpc.i   2005-02-10 03:16:33 UTC 
(rev 5292)
+++ branches/SAMBA_4_0/source/scripting/swig/dcerpc.i   2005-02-10 03:19:21 UTC 
(rev 5293)
@@ -182,14 +182,31 @@
$result = PyLong_FromLong(*$1);
 }
 
+%typemap(in) struct policy_handle * {
+
+   if ((SWIG_ConvertPtr($input, (void **) &$1, $1_descriptor,
+SWIG_POINTER_EXCEPTION)) == -1) 
+   return NULL;
+
+   if ($1 == NULL) {
+   PyErr_SetString(PyExc_TypeError, "None is not a valid policy 
handle");
+   return NULL;
+   }
+}
+
 /* When returning a policy handle to Python we need to make a copy of
as the talloc context it is created under is destroyed after the
wrapper function returns.  TODO: Fix memory leak created here. */
 
 %typemap(out) struct policy_handle * {
-   struct policy_handle *temp = (struct policy_handle 
*)malloc(sizeof(struct policy_handle));
-   memcpy(temp, $1, sizeof(struct policy_handle));
-   $result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
+   if ($1) {
+   struct policy_handle *temp = (struct policy_handle 
*)malloc(sizeof(struct policy_handle));
+   memcpy(temp, $1, sizeof(struct policy_handle));
+   $result = SWIG_NewPointerObj(temp, SWIGTYPE_p_policy_handle, 0);
+   } else {
+   Py_INCREF(Py_None);
+   $result = Py_None;
+   }
 }
 
 %{

svn commit: samba r5292 - in branches/SAMBA_4_0/source/lib/events: .

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 03:16:33 + (Thu, 10 Feb 2005)
New Revision: 5292

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5292

Log:
ensure we cleanup the epoll_fd on event context destruction


Modified:
   branches/SAMBA_4_0/source/lib/events/events.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events.c
===
--- branches/SAMBA_4_0/source/lib/events/events.c   2005-02-10 01:19:26 UTC 
(rev 5291)
+++ branches/SAMBA_4_0/source/lib/events/events.c   2005-02-10 03:16:33 UTC 
(rev 5292)
@@ -113,6 +113,21 @@
 
 
 /*
+  destroy an event context
+*/
+static int event_context_destructor(void *ptr)
+{
+#if WITH_EPOLL
+   struct event_context *ev = talloc_get_type(ptr, struct event_context);
+   if (ev->epoll_fd != -1) {
+   close(ev->epoll_fd);
+   ev->epoll_fd = -1;
+   }
+#endif
+   return 0;
+}
+
+/*
   create a event_context structure. This must be the first events
   call, and all subsequent calls pass this event_context as the first
   element. Event handlers also receive this as their first argument.
@@ -128,6 +143,8 @@
ev->epoll_fd = epoll_create(64);
 #endif
 
+   talloc_set_destructor(ev, event_context_destructor);
+
return ev;
 }

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

2005-02-09 Thread tridge 
Author: tridge
Date: 2005-02-10 01:19:26 + (Thu, 10 Feb 2005)
New Revision: 5291

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5291

Log:
fixed ncacn_ip_tcp against windows

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c  2005-02-09 23:46:14 UTC 
(rev 5290)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c  2005-02-10 01:19:26 UTC 
(rev 5291)
@@ -731,8 +731,7 @@
 
tower->floors[0].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, 
&binding->object, binding->object_version);
 
-   tower->floors[0].rhs.uuid.unknown = data_blob_talloc(mem_ctx, NULL, 0);
-
+   tower->floors[0].rhs.uuid.unknown = data_blob_talloc_zero(mem_ctx, 2);

/* Floor 1 */
tower->floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
@@ -744,7 +743,7 @@
 
tower->floors[1].lhs.lhs_data = dcerpc_floor_pack_lhs_data(mem_ctx, 
&ndr_guid, NDR_GUID_VERSION);

-   tower->floors[1].rhs.uuid.unknown = data_blob_talloc(mem_ctx, NULL, 0);
+   tower->floors[1].rhs.uuid.unknown = data_blob_talloc_zero(mem_ctx, 2);

/* Floor 2 to num_protocols */
for (i = 0; i < num_protocols; i++) {

Build status as of Thu Feb 10 00:00:02 2005

2005-02-09 Thread build 
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2005-02-09 
00:00:23.0 +
+++ /home/build/master/cache/broken_results.txt 2005-02-10 00:00:04.0 
+
@@ -1,14 +1,14 @@
-Build status as of Wed Feb  9 00:00:02 2005
+Build status as of Thu Feb 10 00:00:02 2005
 
 Build counts:
 Tree Total  Broken Panic 
 ccache   38 6  0 
-distcc   38 4  0 
+distcc   38 3  0 
 ppp  22 5  0 
 rsync37 4  0 
 samba1  1  1 
 samba-docs   0  0  0 
-samba4   40 13 0 
+samba4   40 11 0 
 samba_3_038 11 1 
 
 Currently broken builds:
@@ -17,7 +17,6 @@
 cyberone   samba4   gccok/ 2/?/? 
 cyberone   samba_3_0gcc 1/?/?/?  
 fusberta   samba4   gccok/ 2/?/? 
-samba-s390 samba4   gccok/ 2/?/? 
 rhonwynsamba4   gcc-4.0ok/ 2/?/? 
 rhonwynsamba_3_0gcc-4.0ok/ 2/?/? 
 quango ccache   gcc 137/?/?/?
@@ -28,11 +27,9 @@
 aretnapsamba4   iccok/ 1/?/? 
 sbfrsyncgccok/ 1/?/? 
 sbfsamba_3_0gccok/ 1/?/? 
-smartserv1 distcc   gcc 2/?/?/?  
 us4samba_3_0cc ok/ 1/?/? 
-us4samba_3_0gcc 127/?/?/?
-flock  samba4   gcc 127/?/?/?
-homer  samba4   gccok/ 2/?/? 
+us4samba_3_0gccok/ 1/?/? 
+flock  samba4   gccok/ 1/?/? 
 opisol10   ccache   gccok/ok/ok/ 1
 opisol10   ppp  gccok/ 1/?/? 
 opisol10   samba4   gccok/ 1/?/?

svn commit: samba r5290 - in branches/SAMBA_3_0/source/smbd: .

2005-02-09 Thread jra 
Author: jra
Date: 2005-02-09 23:46:14 + (Wed, 09 Feb 2005)
New Revision: 5290

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5290

Log:
Fix for bug #2323 - plaintext problem with WinXP.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/sesssetup.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/sesssetup.c
===
--- branches/SAMBA_3_0/source/smbd/sesssetup.c  2005-02-09 23:45:57 UTC (rev 
5289)
+++ branches/SAMBA_3_0/source/smbd/sesssetup.c  2005-02-09 23:46:14 UTC (rev 
5290)
@@ -755,10 +755,18 @@
pstring pass;
BOOL unic=SVAL(inbuf, smb_flg2) & 
FLAGS2_UNICODE_STRINGS;
 
+#if 0
+   /* This was the previous fix. Not sure if it's still 
valid. JRA. */
if ((ra_type == RA_WINNT) && (passlen2 == 0) && unic && 
passlen1) {
/* NT4.0 stuffs up plaintext unicode password 
lengths... */
srvstr_pull(inbuf, pass, smb_buf(inbuf) + 1,
sizeof(pass), passlen1, STR_TERMINATE);
+#endif
+
+   if (unic && (passlen2 == 0) && passlen1) {
+   /* Only a ascii plaintext password was sent. */
+   srvstr_pull(inbuf, pass, smb_buf(inbuf), 
sizeof(pass),
+   passlen1, STR_TERMINATE|STR_ASCII);
} else {
srvstr_pull(inbuf, pass, smb_buf(inbuf), 
sizeof(pass),  unic ? passlen2 : 
passlen1,

svn commit: samba r5289 - in trunk/source/smbd: .

2005-02-09 Thread jra 
Author: jra
Date: 2005-02-09 23:45:57 + (Wed, 09 Feb 2005)
New Revision: 5289

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5289

Log:
Fix for bug #2323 - plaintext problem with WinXP.
Jeremy.

Modified:
   trunk/source/smbd/sesssetup.c


Changeset:
Modified: trunk/source/smbd/sesssetup.c
===
--- trunk/source/smbd/sesssetup.c   2005-02-09 21:53:25 UTC (rev 5288)
+++ trunk/source/smbd/sesssetup.c   2005-02-09 23:45:57 UTC (rev 5289)
@@ -755,10 +755,18 @@
pstring pass;
BOOL unic=SVAL(inbuf, smb_flg2) & 
FLAGS2_UNICODE_STRINGS;
 
+#if 0
+   /* This was the previous fix. Not sure if it's still 
valid. JRA. */
if ((ra_type == RA_WINNT) && (passlen2 == 0) && unic && 
passlen1) {
/* NT4.0 stuffs up plaintext unicode password 
lengths... */
srvstr_pull(inbuf, pass, smb_buf(inbuf) + 1,
sizeof(pass), passlen1, STR_TERMINATE);
+#endif
+
+   if (unic && (passlen2 == 0) && passlen1) {
+   /* Only a ascii plaintext password was sent. */
+   srvstr_pull(inbuf, pass, smb_buf(inbuf), 
sizeof(pass),
+   passlen1, STR_TERMINATE|STR_ASCII);
} else {
srvstr_pull(inbuf, pass, smb_buf(inbuf), 
sizeof(pass),  unic ? passlen2 : 
passlen1,

svn commit: samba r5288 - in branches/SAMBA_4_0/source/build/pidl: .

2005-02-09 Thread jelmer 
Author: jelmer
Date: 2005-02-09 21:53:25 + (Wed, 09 Feb 2005)
New Revision: 5288

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5288

Log:
Make alignment code more generic

Modified:
   branches/SAMBA_4_0/source/build/pidl/parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/parser.pm  2005-02-09 21:23:33 UTC 
(rev 5287)
+++ branches/SAMBA_4_0/source/build/pidl/parser.pm  2005-02-09 21:53:25 UTC 
(rev 5288)
@@ -1,5 +1,5 @@
 ###
-# Samba4 parser generator for IDL structures
+# Samba4 NDR parser generator for IDL structures
 # Copyright [EMAIL PROTECTED] 2000-2003
 # Copyright [EMAIL PROTECTED] 2001
 # Copyright [EMAIL PROTECTED] 2004
@@ -10,8 +10,8 @@
 use strict;
 use needed;
 
-# the list of needed functions
-my %structs;
+# list of known types
+my %typedefs;
 
 sub pidl($)
 {
@@ -184,20 +184,7 @@
for my $e (@{$s->{ELEMENTS}}) {
my $a = 1;
 
-   if (!util::need_wire_pointer($e)
-   && defined $structs{$e->{TYPE}}) {
-   if ($structs{$e->{TYPE}}->{DATA}->{TYPE} eq "STRUCT") {
-   $a = 
struct_alignment($structs{$e->{TYPE}}->{DATA});
-   } elsif ($structs{$e->{TYPE}}->{DATA}->{TYPE} eq 
"UNION") {
-   if (defined $structs{$e->{TYPE}}->{DATA}) {
-   $a = 
union_alignment($structs{$e->{TYPE}}->{DATA});
-   }
-   } elsif ($structs{$e->{TYPE}}->{DATA}->{TYPE} eq 
"ENUM") {
-   $a = util::type_align($e);
-   }
-   } else {
-   $a = util::type_align($e);
-   }
+   $a = align_type($e);
 
if ($align < $a) {
$align = $a;
@@ -222,17 +209,7 @@
next;
}
 
-   if (!util::need_wire_pointer($e)
-   && defined $structs{$e->{DATA}->{TYPE}}) {
-   my $s = $structs{$e->{DATA}->{TYPE}};
-   if ($s->{DATA}->{TYPE} eq "STRUCT") {
-   $a = struct_alignment($s->{DATA});
-   } elsif ($s->{DATA}->{TYPE} eq "UNION") {
-   $a = union_alignment($s->{DATA});
-   }
-   } else {
-   $a = util::type_align($e->{DATA});
-   }
+   $a = align_type($e->{DATA});
 
if ($align < $a) {
$align = $a;
@@ -243,6 +220,28 @@
 }
 
 #
+# align a type
+sub align_type
+{
+   my $e = shift;
+
+   if (!util::need_wire_pointer($e)
+   && defined $typedefs{$e->{TYPE}}) {
+   if ($typedefs{$e->{TYPE}}->{DATA}->{TYPE} eq "STRUCT") {
+   return struct_alignment($typedefs{$e->{TYPE}}->{DATA});
+   } elsif ($typedefs{$e->{TYPE}}->{DATA}->{TYPE} eq "UNION") {
+   if (defined $typedefs{$e->{TYPE}}->{DATA}) {
+   return 
union_alignment($typedefs{$e->{TYPE}}->{DATA});
+   }
+   } elsif ($typedefs{$e->{TYPE}}->{DATA}->{TYPE} eq "ENUM") {
+   return util::type_align($e);
+   }
+   } else {
+   return util::type_align($e);
+   }
+}
+
+#
 # parse an array - push side
 sub ParseArrayPush($$$)
 {
@@ -457,7 +456,7 @@
 
my $cprefix = util::c_pull_prefix($e);
 
-   my $utype = $structs{$e->{TYPE}};
+   my $utype = $typedefs{$e->{TYPE}};
 
check_null_pointer($switch_var);
 
@@ -511,7 +510,7 @@
 
check_null_pointer($switch_var);
 
-   my $utype = $structs{$e->{TYPE}};
+   my $utype = $typedefs{$e->{TYPE}};
if (!defined $utype ||
!util::has_property($utype, "nodiscriminant")) {
my $e2 = find_sibling($e, $switch);
@@ -1713,10 +1712,10 @@
 
foreach my $d (@{$data}) {
if ($d->{TYPE} eq "DECLARE") {
-   $structs{$d->{NAME}} = $d;
+   $typedefs{$d->{NAME}} = $d;
}
if ($d->{TYPE} eq "TYPEDEF") {
-   $structs{$d->{NAME}} = $d;
+   $typedefs{$d->{NAME}} = $d;
}
}
 
@@ -1812,3 +1811,14 @@
 }
 
 1;
+
+#Each type can:
+#
+#- Generate push fn
+#- Generate pull fn
+#- Generate print fn
+#- Generate push array fn
+#- Generate pull array fn
+#- Generate print fn
+#- align size
+#- "push prefix"

svn commit: samba r5287 - in branches/SAMBA_3_0/source/smbd: .

2005-02-09 Thread herb 
Author: herb
Date: 2005-02-09 21:23:33 + (Wed, 09 Feb 2005)
New Revision: 5287

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5287

Log:
fix build problem when HAVE_POSIX_ACL not defined

Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-09 21:10:23 UTC (rev 
5286)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-02-09 21:23:33 UTC (rev 
5287)
@@ -2191,6 +2191,7 @@
return UNIXERROR(def_class,def_code);
 }
 
+#if defined(HAVE_POSIX_ACLS)
 /
  Utility function to count the number of entries in a POSIX acl.
 /
@@ -2305,6 +2306,7 @@
 
return True;
 }
+#endif
 
 /
  Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
@@ -2870,6 +2872,7 @@
break;
}
 
+#if defined(HAVE_POSIX_ACLS)
case SMB_QUERY_POSIX_ACL:
{
SMB_ACL_T file_acl = NULL;
@@ -2946,6 +2949,7 @@
data_size = (num_file_acls + 
num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE;
break;
}
+#endif
 
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);
@@ -3755,6 +3759,7 @@
return(-1);
}
 
+#if defined(HAVE_POSIX_ACLS)
case SMB_SET_POSIX_ACL:
{
uint16 posix_acl_version;
@@ -3804,6 +3809,7 @@
send_trans2_replies(outbuf, bufsize, params, 2, 
*ppdata, 0);
return(-1);
}
+#endif
 
default:
return ERROR_DOS(ERRDOS,ERRunknownlevel);

svn commit: samba r5286 - in branches/SAMBA_4_0/source: build/pidl libcli/nbt librpc/ndr librpc/rpc ntvfs/ipc torture/rap

2005-02-09 Thread jelmer 
Author: jelmer
Date: 2005-02-09 21:10:23 + (Wed, 09 Feb 2005)
New Revision: 5286

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5286

Log:
Some first steps in making the pidl code somewhat more generic for the 
various data types:

Add ndr_flags argument to all ndr push/pull scalar functions

Modified:
   branches/SAMBA_4_0/source/build/pidl/header.pm
   branches/SAMBA_4_0/source/build/pidl/parser.pm
   branches/SAMBA_4_0/source/build/pidl/util.pm
   branches/SAMBA_4_0/source/libcli/nbt/nbtname.c
   branches/SAMBA_4_0/source/librpc/ndr/libndr.h
   branches/SAMBA_4_0/source/librpc/ndr/ndr.c
   branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
   branches/SAMBA_4_0/source/librpc/ndr/ndr_dcom.c
   branches/SAMBA_4_0/source/librpc/ndr/ndr_sec.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/ntvfs/ipc/ipc_rap.c
   branches/SAMBA_4_0/source/torture/rap/rap.c


Changeset:
Sorry, the patch is too large (1262 lines) to include; please use WebSVN to see 
it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5286

svn commit: samba-docs r355 - in trunk: Samba-Guide Samba-HOWTO-Collection smbdotconf/logon

2005-02-09 Thread jht 
Author: jht
Date: 2005-02-09 21:06:50 + (Wed, 09 Feb 2005)
New Revision: 355

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=355

Log:
Commiting Lars Mueller's patch.
Modified:
   trunk/Samba-Guide/Chap03-TheSmallOffice.xml
   trunk/Samba-Guide/Chap04-SecureOfficeServer.xml
   trunk/Samba-Guide/Chap05-500UserNetwork.xml
   trunk/Samba-HOWTO-Collection/DomainMember.xml
   trunk/Samba-HOWTO-Collection/FastStart.xml
   trunk/smbdotconf/logon/addmachinescript.xml


Changeset:
Modified: trunk/Samba-Guide/Chap03-TheSmallOffice.xml
===
--- trunk/Samba-Guide/Chap03-TheSmallOffice.xml 2005-02-07 17:54:11 UTC (rev 
354)
+++ trunk/Samba-Guide/Chap03-TheSmallOffice.xml 2005-02-09 21:06:50 UTC (rev 
355)
@@ -665,7 +665,7 @@
 delete group script/usr/sbin/groupdel 
'%g'
 add user to group script/usr/sbin/usermod 
-G '%g' '%u'
 add machine script/usr/sbin/useradd 
\
--s /bin/false -d /dev/null '%u'
+-s /bin/false -d /var/lib/nobody '%u'
 logon 
scriptscripts\login.bat
 logon path 
 logon driveX:
@@ -751,7 +751,7 @@
 delete group script = /usr/sbin/groupdel '%g'
 add user to group script = /usr/sbin/usermod -G '%g' '%u'
 add machine script = /usr/sbin/useradd 
-   -s /bin/false -d /dev/null '%u'
+   -s /bin/false -d /var/lib/nobody '%u'
 logon script = scripts\logon.bat
 logon path =
 logon drive = X:

Modified: trunk/Samba-Guide/Chap04-SecureOfficeServer.xml
===
--- trunk/Samba-Guide/Chap04-SecureOfficeServer.xml 2005-02-07 17:54:11 UTC 
(rev 354)
+++ trunk/Samba-Guide/Chap04-SecureOfficeServer.xml 2005-02-09 21:06:50 UTC 
(rev 355)
@@ -1924,7 +1924,7 @@
 delete group script = /usr/sbin/groupdel %g
 add user to group script = /usr/sbin/usermod -G %g %u
 add machine script = /usr/sbin/useradd \
-   -s /bin/false -d /dev/null %u
+   -s /bin/false -d /var/lib/nobody %u
 shutdown script = /var/lib/samba/scripts/shutdown.sh
 abort shutdown script = /sbin/shutdown -c
 logon script = scripts\logon.bat

Modified: trunk/Samba-Guide/Chap05-500UserNetwork.xml
===
--- trunk/Samba-Guide/Chap05-500UserNetwork.xml 2005-02-07 17:54:11 UTC (rev 
354)
+++ trunk/Samba-Guide/Chap05-500UserNetwork.xml 2005-02-09 21:06:50 UTC (rev 
355)
@@ -957,7 +957,7 @@
 add group script/usr/sbin/groupadd 
'%g'
 delete group script/usr/sbin/groupdel 
'%g'
 add user to group script/usr/sbin/usermod 
-G '%g' '%u'
-add machine script/usr/sbin/useradd -s 
/bin/false -d /dev/null '%u'
+add machine script/usr/sbin/useradd -s 
/bin/false -d /var/lib/nobody '%u'
 preferred masterYes
 wins supportYes
 
include/etc/samba/dc-common.conf

Modified: trunk/Samba-HOWTO-Collection/DomainMember.xml
===
--- trunk/Samba-HOWTO-Collection/DomainMember.xml   2005-02-07 17:54:11 UTC 
(rev 354)
+++ trunk/Samba-HOWTO-Collection/DomainMember.xml   2005-02-09 21:06:50 UTC 
(rev 355)
@@ -200,7 +200,7 @@
 useradd
 vipw
 
-&rootprompt;/usr/sbin/useradd -g machines -d /dev/null -c 
"machine nickname" \
+&rootprompt;/usr/sbin/useradd -g machines -d /var/lib/nobody -c 
"machine nickname" \
-s /bin/false machine_name$ 
 
 &rootprompt;passwd -l 
machine_name$
@@ -378,7 +378,7 @@
 
 [global]
 <...remainder of parameters...>
-add machine script/usr/sbin/useradd -d 
/dev/null -g 100 \
+add machine script/usr/sbin/useradd -d 
/var/lib/nobody -g 100 \
   -s /bin/false -M %u
 
 

Modified: trunk/Samba-HOWTO-Collection/FastStart.xml
===
--- trunk/Samba-HOWTO-Collection/FastStart.xml  2005-02-07 17:54:11 UTC (rev 
354)
+++ trunk/Samba-HOWTO-Collection/FastStart.xml  2005-02-09 21:06:50 UTC (rev 
355)
@@ -890,7 +890,7 @@
 delete group script/usr/sbin/groupdel 
%g
 add user to group script/usr/sbin/usermod 
-G %g %u
 add machine script/usr/sbin/useradd -s 
/bin/false \
--d /dev/null %u
+-d /var/lib/nobody %u
 Note: The following specifies the default logon 
script.
 Per user logon scripts can be specified in the user account 
using pdbedit 
 logon 
scriptscripts\logon.bat

Modified: trunk/smbdotconf/logon/addmachinescript.xml
===
--- trunk/smbdotconf/logon/addmachinescript.xml 2005-02-07 17:54:11 UTC (rev 
354)
+++ trunk/smbdotconf/logon/addmachinescript.xml 2005-02-09 21:06:50 UTC (rev 
355)
@@ -16,5 +16,5 @@
 
 
 
-/usr/sbin/adduser -n -g machines -c Machine -d /dev/null 
-s /bin/false %u
+/usr/sbin/adduser -n -g machines -c Machine -d 
/var/lib/nobody -s /bin/false %u

svn commit: samba r5285 - in branches/SAMBA_4_0/source/include: .

2005-02-09 Thread metze 
Author: metze
Date: 2005-02-09 17:29:09 + (Wed, 09 Feb 2005)
New Revision: 5285

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5285

Log:
add a generic dlist_item struct which has a void *ptr for the data

metze

Modified:
   branches/SAMBA_4_0/source/include/dlinklist.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/dlinklist.h
===
--- branches/SAMBA_4_0/source/include/dlinklist.h   2005-02-09 13:51:14 UTC 
(rev 5284)
+++ branches/SAMBA_4_0/source/include/dlinklist.h   2005-02-09 17:29:09 UTC 
(rev 5285)
@@ -21,6 +21,10 @@
 /* To use these macros you must have a structure containing a next and
prev pointer */
 
+struct dlist_item {
+   struct dlist_item *prev, *next;
+   void *ptr;  
+};
 
 /* hook into the front of the list */
 #define DLIST_ADD(list, p) \

svn commit: samba r5284 - in branches/SAMBA_4_0/source/lib/events: .

2005-02-09 Thread metze 
Author: metze
Date: 2005-02-09 13:51:14 + (Wed, 09 Feb 2005)
New Revision: 5284

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5284

Log:
this is needed on my server

+/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */
+#undef u32

as sys/epoll.h has this:
typedef union epoll_data
{
  void *ptr;
  int fd;
  uint32_t u32;
  uint64_t u64;
} epoll_data_t;

metze

Modified:
   branches/SAMBA_4_0/source/lib/events/events.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events.c
===
--- branches/SAMBA_4_0/source/lib/events/events.c   2005-02-08 23:17:44 UTC 
(rev 5283)
+++ branches/SAMBA_4_0/source/lib/events/events.c   2005-02-09 13:51:14 UTC 
(rev 5284)
@@ -66,6 +66,8 @@
 #endif
 
 #if WITH_EPOLL
+/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */
+#undef u32
 #include 
 #endif

svn commit: lorikeet r223 - in trunk/white-papers/dcom: .

2005-02-09 Thread jelmer 
Author: jelmer
Date: 2005-02-09 10:32:39 + (Wed, 09 Feb 2005)
New Revision: 223

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=223

Log:
Clarify some things (after feedback from Vance)

Modified:
   trunk/white-papers/dcom/dcom.tex


Changeset:
Sorry, the patch is too large (272 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=223