Re: svn commit: samba r1720 - branches/SAMBA_3_0/source/utils trunk/source/utils

2004-08-11 Thread Volker Lendecke
On Wed, Aug 11, 2004 at 09:32:32AM +, [EMAIL PROTECTED] wrote:
branches/SAMBA_3_0/source/utils/net_groupmap.c
trunk/source/utils/net_groupmap.c

Wait a minute -- how did you set up your tree to be able to do a combined
commit???

Volker


Re: svn commit: samba r1720 - branches/SAMBA_3_0/source/utils trunk/source/utils

2004-08-11 Thread Guenther Deschner
Hi Volker,

On Wed, Aug 11, 2004 at 01:41:14PM +0200, Volker Lendecke wrote:
 On Wed, Aug 11, 2004 at 09:32:32AM +, [EMAIL PROTECTED] wrote:
 branches/SAMBA_3_0/source/utils/net_groupmap.c
 trunk/source/utils/net_groupmap.c
 
 Wait a minute -- how did you set up your tree to be able to do a combined
 commit???

quite easy: I just checked out $SERVER/samba and below samba I call 

svn ci branches/SAMBA_3_0/source/utils trunk/source/utils

Cheers,
Guenther
-- 
Guenther Deschner,  SerNet Service Network GmbH
Phone: +49-(0)551-37-0,  Fax: +49-(0)551-37-9


pgpMW0afLjjxj.pgp
Description: PGP signature


svn commit: samba r1722 - in trunk/source: passdb utils

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-11 15:46:33 + (Wed, 11 Aug 2004)
New Revision: 1722
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/trunk/sourcerev=1722nolog=1
Log:
Empty (zeroed) sid passed in update function argument means do not change it.
Also, more descriptive comment of ldap mod structure initialisation from trust
password structure.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c
   trunk/source/utils/pdbedit.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-11 09:34:30 UTC (rev 1721)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-11 15:46:33 UTC (rev 1722)
@@ -3252,7 +3252,9 @@
 
 
 /**
- * Init LDAP structures passed to ldap calls from trust password structure.
+ * Init LDAP structures passed to ldap calls from trust password structure. Fill out
+ * every field if in case of new ldap entry (entry parameter is NULL) or only those
+ * that have changed, when compared to existing ldap entry (entry parameter is not 
NULL).
  *
  * @param ldap_state LDAP state structure required by ldap calls
  * @param entry LDAPMessage existing entry structure returned from ldap calls (if any)
@@ -3319,10 +3321,16 @@
if (entry) {
ret = 
smbldap_get_single_attribute(ldap_state-smbldap_state-ldap_struct, entry,
   attr_sid, attr_val, 
sizeof(attr_val));
-   if (ret)
-   if (strncmp(sid_to_string(sidstr, sid), attr_val, 
sizeof(attr_val)))
+   if (ret) {
+   /* pattern of empty sid compare */
+   DOM_SID empty;
+   memset(empty, 0, sizeof(empty));
+
+   if (memcmp((void*)sid, (void*)empty, sizeof(DOM_SID)) 
+   strncmp(sid_to_string(sidstr, sid), attr_val, 
sizeof(attr_val)))

smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
 attr_sid, sidstr);
+   }
} else {
smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
 attr_sid, sidstr);

Modified: trunk/source/utils/pdbedit.c
===
--- trunk/source/utils/pdbedit.c2004-08-11 09:34:30 UTC (rev 1721)
+++ trunk/source/utils/pdbedit.c2004-08-11 15:46:33 UTC (rev 1722)
@@ -834,7 +834,8 @@
printf(Error: incorrect SID specified !\n);
return -1;
}
-   }
+   } else
+   memset(trust.private.domain_sid, 0, sizeof(trust.private.domain_sid));
 
/* flags */
trust.private.flags = (flag) ? trustpw_flag(flag) : 0;



svn commit: samba r1723 - branches/SAMBA_4_0/source/libcli/util

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 16:09:54 + (Wed, 11 Aug 2004)
New Revision: 1723
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1723nolog=1
Log:
Make sure we bail out on error in reading a OID.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/util/asn1.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/asn1.c
===
--- branches/SAMBA_4_0/source/libcli/util/asn1.c2004-08-11 15:46:33 UTC (rev 
1722)
+++ branches/SAMBA_4_0/source/libcli/util/asn1.c2004-08-11 16:09:54 UTC (rev 
1723)
@@ -354,7 +354,7 @@
oid = talloc_asprintf(mem_ctx, %u,  b/40);
oid = talloc_asprintf_append(mem_ctx, oid,  %u,  b%40);
 
-   while (asn1_tag_remaining(data)  0) {
+   while (!data-has_error  asn1_tag_remaining(data)  0) {
uint_t v = 0;
do {
asn1_read_uint8(data, b);



svn commit: samba r1724 - branches/SAMBA_4_0/source/libcli/auth

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 16:13:25 + (Wed, 11 Aug 2004)
New Revision: 1724
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1724nolog=1
Log:
Add a new function to return the list of available OIDs.

(Used in our SPNEGO code).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/gensec.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1725 - branches/SAMBA_4_0/source/libcli/raw

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 16:15:21 + (Wed, 11 Aug 2004)
New Revision: 1725
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1725nolog=1
Log:
Remove a silly 'utility' function.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/smb_signing.c
===
--- branches/SAMBA_4_0/source/libcli/raw/smb_signing.c  2004-08-11 16:13:25 UTC (rev 
1724)
+++ branches/SAMBA_4_0/source/libcli/raw/smb_signing.c  2004-08-11 16:15:21 UTC (rev 
1725)
@@ -50,20 +50,6 @@
return True;
 }
 
-/***
- SMB signing - Common code for 'real' implementations
-/
-static BOOL set_smb_signing_real_common(struct smbcli_transport *transport) 
-{
-   if (transport-negotiate.sign_info.mandatory_signing) {
-   DEBUG(5, (Mandatory SMB signing enabled!\n));
-   }
-
-   DEBUG(5, (SMB signing enabled!\n));
-
-   return True;
-}
-
 static void mark_packet_signed(struct request_buffer *out) 
 {
uint16_t flags2;
@@ -268,10 +254,12 @@
return False;
}
 
-   if (!set_smb_signing_real_common(transport)) {
-   return False;
+   if (transport-negotiate.sign_info.mandatory_signing) {
+   DEBUG(5, (Mandatory SMB signing enabled!\n));
}
 
+   DEBUG(5, (SMB signing enabled!\n));
+
data = smb_xmalloc(sizeof(*data));
transport-negotiate.sign_info.signing_context = data;




svn commit: samba r1726 - branches/SAMBA_4_0/source/smb_server

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 16:16:28 + (Wed, 11 Aug 2004)
New Revision: 1726
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1726nolog=1
Log:
Fix up the comments and indenting.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/smb_server/password.c

Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/password.c
===
--- branches/SAMBA_4_0/source/smb_server/password.c 2004-08-11 16:15:21 UTC (rev 
1725)
+++ branches/SAMBA_4_0/source/smb_server/password.c 2004-08-11 16:16:28 UTC (rev 
1726)
@@ -85,11 +85,9 @@
 
 /**
  *  register that a valid login has been performed, establish 'session'.
- *  @param server_info The token returned from the authentication process. 
+ *  @param session_info The token returned from the authentication process (if the 
authentication has completed)
  *   (now 'owned' by register_vuid)
  *
- *  @param session_key The User session key for the login session (now also 'owned' 
by register_vuid)
- *
  *  @param smb_name The untranslated name of the user
  *
  *  @return Newly allocated vuid, biased by an offset. (This allows us to
@@ -98,8 +96,8 @@
  */
 
 uint16_t smbsrv_register_session(struct smbsrv_connection *smb_conn,
-   struct auth_session_info *session_info,
-   struct gensec_security *gensec_ctx)
+struct auth_session_info *session_info,
+struct gensec_security *gensec_ctx)
 {
struct smbsrv_session *sess = NULL;
 



svn commit: samba r1727 - branches/SAMBA_4_0/source/smb_server

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 16:17:43 + (Wed, 11 Aug 2004)
New Revision: 1727
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1727nolog=1
Log:
SPNEGO session setup replies need to include the blob, even on error
cases, so don't shorten them back to 0 byte data length.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/smb_server/reply.c

Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/reply.c
===
--- branches/SAMBA_4_0/source/smb_server/reply.c2004-08-11 16:16:28 UTC (rev 
1726)
+++ branches/SAMBA_4_0/source/smb_server/reply.c2004-08-11 16:17:43 UTC (rev 
1727)
@@ -2048,14 +2048,13 @@
/* call the generic handler */
status = sesssetup_backend(req, sess);
 
-   if (!NT_STATUS_IS_OK(status)) {
-   req_reply_error(req, status);
-   return;
-   }
-
/* construct reply */
req_setup_reply(req, 4, sess.spnego.out.secblob.length);
 
+   if (!NT_STATUS_IS_OK(status)) {
+   req_setup_error(req, status);
+   }
+
SSVAL(req-out.vwv, VWV(0), SMB_CHAIN_NONE);
SSVAL(req-out.vwv, VWV(1), 0);
SSVAL(req-out.vwv, VWV(2), sess.spnego.out.action);



Re: svn commit: samba r1720 - branches/SAMBA_3_0/source/utils trunk/source/utils

2004-08-11 Thread Volker Lendecke
On Wed, Aug 11, 2004 at 01:59:46PM +0200, Guenther Deschner wrote:
 quite easy: I just checked out $SERVER/samba and below samba I call 

Ok, I did not do this quite yet as this probably is huge :-)

Volker


svn commit: samba r1728 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-11 16:27:31 + (Wed, 11 Aug 2004)
New Revision: 1728
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1728nolog=1
Log:
1) Domain name field in ldap mod structure should be changed only when
   the actual field has changed (as is the case with sid, flags, etc.).
2) Quiet const-related compiler warnings.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-11 16:17:43 UTC (rev 1727)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-11 16:27:31 UTC (rev 1728)
@@ -3286,12 +3286,14 @@
 
/* Domain name of the trust */
if (entry) {
-   ret = 
smbldap_get_single_attribute(ldap_state-smbldap_state-ldap_struct, entry,
-  attr_domain, attr_val, 
sizeof(attr_val));
-   if (ret)
-   if (strncmp(pdb_get_tp_domain_name_c(trustpw), attr_val, 
sizeof(attr_val)))
-   
smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
-attr_domain, 
pdb_get_tp_domain_name_c(trustpw));
+   if (strlen(pdb_get_tp_domain_name_c(trustpw))) {
+   ret = 
smbldap_get_single_attribute(ldap_state-smbldap_state-ldap_struct, entry,
+  attr_domain, attr_val, 
sizeof(attr_val));
+   if (ret)
+   if (strncmp(pdb_get_tp_domain_name_c(trustpw), 
attr_val, sizeof(attr_val)))
+   
smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
+attr_domain, 
pdb_get_tp_domain_name_c(trustpw));
+   }
} else {
smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
 attr_domain, pdb_get_tp_domain_name_c(trustpw));
@@ -3323,10 +3325,11 @@
   attr_sid, attr_val, 
sizeof(attr_val));
if (ret) {
/* pattern of empty sid compare */
-   DOM_SID empty;
-   memset(empty, 0, sizeof(empty));
+   DOM_SID empty_sid;
+   memset(empty_sid, 0, sizeof(empty_sid));
+   const void *empty = empty_sid, *new = sid;
 
-   if (memcmp((void*)sid, (void*)empty, sizeof(DOM_SID)) 
+   if (memcmp(new, empty, sizeof(DOM_SID)) 
strncmp(sid_to_string(sidstr, sid), attr_val, 
sizeof(attr_val)))

smbldap_make_mod(ldap_state-smbldap_state-ldap_struct, entry, mod,
 attr_sid, sidstr);



svn commit: samba r1729 - in branches/SAMBA_4_0/source: include libcli/raw

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 18:05:30 + (Wed, 11 Aug 2004)
New Revision: 1729
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1729nolog=1
Log:
Make the SMB signing code more generic (to share more between client and servers).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/cli_context.h
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1730 - branches/SAMBA_4_0/source/client

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 18:08:46 + (Wed, 11 Aug 2004)
New Revision: 1730
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1730nolog=1
Log:
We cannot dereference c-tree here, as there is not a tree yet.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/client/client.c

Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===
--- branches/SAMBA_4_0/source/client/client.c   2004-08-11 18:05:30 UTC (rev 1729)
+++ branches/SAMBA_4_0/source/client/client.c   2004-08-11 18:08:46 UTC (rev 1730)
@@ -2782,8 +2782,8 @@
 
if (!smbcli_transport_establish(c, calling, called)) {
char *p;
-   d_printf(session request to %s failed (%s)\n, 
-called.name, smbcli_errstr(c-tree));
+   d_printf(session request to %s failed\n, 
+called.name);
smbcli_shutdown(c);
if ((p=strchr_m(called.name, '.'))) {
*p = 0;



svn commit: samba r1731 - in branches/SAMBA_4_0/source: libcli/auth smb_server

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 18:09:40 + (Wed, 11 Aug 2004)
New Revision: 1731
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1731nolog=1
Log:
Add server-side SPNEGO support to Samba (disabled, until SMB signing
is reworked).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/spnego.c
   branches/SAMBA_4_0/source/smb_server/negprot.c
   branches/SAMBA_4_0/source/smb_server/sesssetup.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1733 - branches/SAMBA_3_0/source/passdb

2004-08-11 Thread jra
Author: jra
Date: 2004-08-11 18:39:29 + (Wed, 11 Aug 2004)
New Revision: 1733
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1733nolog=1
Log:
Fix hashed password history for LDAP backends.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c

Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2004-08-11 18:27:00 UTC (rev 1732)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2004-08-11 18:39:29 UTC (rev 1733)
@@ -701,24 +701,35 @@
uint8 *pwhist = NULL;
int i;
 
-   if ((pwhist = malloc(NT_HASH_LEN * pwHistLen)) == NULL){
+   if ((pwhist = malloc(pwHistLen * PW_HISTORY_ENTRY_LEN)) == NULL){
DEBUG(0, (init_sam_from_ldap: malloc failed!\n));
return False;
}
-   memset(pwhist, '\0', NT_HASH_LEN * pwHistLen);
+   memset(pwhist, '\0', pwHistLen * PW_HISTORY_ENTRY_LEN);
 
if (!smbldap_get_single_pstring 
(ldap_state-smbldap_state-ldap_struct, entry, 
get_userattr_key2string(ldap_state-schema_ver, 
LDAP_ATTR_PWD_HISTORY), temp)) {
/* leave as default - zeros */
} else {
+   BOOL hex_failed = False;
for (i = 0; i  pwHistLen; i++){
-   if (!pdb_gethexpwd(temp[i*32], smbntpwd)) {
+   /* Get the 16 byte salt. */
+   if (!pdb_gethexpwd(temp[i*64], 
pwhist[i*PW_HISTORY_ENTRY_LEN])) {
+   hex_failed = True;
break;
}
-   memset(temp[i*32], '\0', 32);
-   memcpy(pwhist[i*NT_HASH_LEN], smbntpwd, NT_HASH_LEN);
-   ZERO_STRUCT(smbntpwd);
+   /* Get the 16 byte MD5 hash of salt+passwd. */
+   if (!pdb_gethexpwd(temp[(i*64)+32],
+   
pwhist[(i*PW_HISTORY_ENTRY_LEN)+PW_HISTORY_SALT_LEN])) {
+   hex_failed = True;
+   break;
+   }
}
+   if (hex_failed) {
+   DEBUG(0,(init_sam_from_ldap: Failed to get password 
history for user %s\n,
+   username));
+   memset(pwhist, '\0', pwHistLen * PW_HISTORY_ENTRY_LEN);
+   }
}
if (!pdb_set_pw_history(sampass, pwhist, pwHistLen, PDB_SET)){
SAFE_FREE(pwhist);
@@ -1023,15 +1034,20 @@
account_policy_get(AP_PASSWORD_HISTORY, pwHistLen);
if (pwHistLen == 0) {
/* Remove any password history from the LDAP store. */
-   pstrcpy(temp, );
+   memset(temp, '0', 64); /* NOTE  '0' *NOT '\0' */
+   temp[64] = '\0';
} else {
int i, currHistLen = 0;
const uint8 *pwhist = pdb_get_pw_history(sampass, 
currHistLen);
if (pwhist != NULL) {
-   /* We can only store (sizeof(pstring)-1)/32 
password history entries. */
-   pwHistLen = MIN(pwHistLen, 
((sizeof(temp)-1)/32));
+   /* We can only store (sizeof(pstring)-1)/64 
password history entries. */
+   pwHistLen = MIN(pwHistLen, 
((sizeof(temp)-1)/64));
for (i=0; i pwHistLen  i  currHistLen; 
i++) {
-   pdb_sethexpwd (temp[i*32], 
pwhist[i*NT_HASH_LEN], 0);
+   /* Store the salt. */
+   pdb_sethexpwd(temp[i*64], 
pwhist[i*PW_HISTORY_ENTRY_LEN], 0);
+   /* Followed by the md5 hash of salt + 
md4 hash */
+   pdb_sethexpwd(temp[(i*64)+32],
+   
pwhist[(i*PW_HISTORY_ENTRY_LEN)+PW_HISTORY_SALT_LEN], 0);
DEBUG(100, (temp=%s\n, temp));
}
} 



svn commit: samba r1734 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-11 19:16:18 + (Wed, 11 Aug 2004)
New Revision: 1734
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1734nolog=1
Log:
Some improvement in init_ldap_from_trustpw and making in more readable
by avoiding unnecessarily nested conditions.

SID compare is now done the way it should be (I'm too young to forget there
are things out there already written to deal with this kind of functionality...)

A little change in debug message.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1735 - in branches/SAMBA_4_0/source: include libcli/raw

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-11 19:29:22 + (Wed, 11 Aug 2004)
New Revision: 1735
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1735nolog=1
Log:
Clean up SMB signing - we don't have more than one 'real' way to sign
a packet, so don't pretend we do...

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/cli_context.h
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1736 - in branches/SAMBA_4_0/source: build/dcom build/pidl librpc/idl librpc/ndr torture torture/rpc

2004-08-11 Thread jelmer
Author: jelmer
Date: 2004-08-11 19:48:36 + (Wed, 11 Aug 2004)
New Revision: 1736
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1736nolog=1
Log:
- Pidl updates:
 - Support for object oriented interfaces in pidl
 - Support for inherited interfaces in pidl
 - Simplification of the support for properties on an interface
- Start on dcom rpc torture tests

Added:
   branches/SAMBA_4_0/source/torture/rpc/dcom.c
Modified:
   branches/SAMBA_4_0/source/build/dcom/procedure
   branches/SAMBA_4_0/source/build/pidl/Makefile
   branches/SAMBA_4_0/source/build/pidl/dump.pm
   branches/SAMBA_4_0/source/build/pidl/eparser.pm
   branches/SAMBA_4_0/source/build/pidl/header.pm
   branches/SAMBA_4_0/source/build/pidl/idl.pm
   branches/SAMBA_4_0/source/build/pidl/idl.yp
   branches/SAMBA_4_0/source/build/pidl/parser.pm
   branches/SAMBA_4_0/source/build/pidl/pidl.pl
   branches/SAMBA_4_0/source/build/pidl/util.pm
   branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
   branches/SAMBA_4_0/source/librpc/idl/dcom.idl
   branches/SAMBA_4_0/source/librpc/idl/misc.idl
   branches/SAMBA_4_0/source/librpc/idl/schannel.idl
   branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
   branches/SAMBA_4_0/source/torture/config.mk

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1737 - branches/SAMBA_4_0/source/libcli/auth

2004-08-11 Thread metze
Author: metze
Date: 2004-08-11 21:06:11 + (Wed, 11 Aug 2004)
New Revision: 1737
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1737nolog=1
Log:
don't segfault when a mech don't have a session_info hook

metze

Modified:
   branches/SAMBA_4_0/source/libcli/auth/gensec.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/gensec.c
===
--- branches/SAMBA_4_0/source/libcli/auth/gensec.c  2004-08-11 19:48:36 UTC (rev 
1736)
+++ branches/SAMBA_4_0/source/libcli/auth/gensec.c  2004-08-11 21:06:11 UTC (rev 
1737)
@@ -355,6 +355,9 @@
 NTSTATUS gensec_session_info(struct gensec_security *gensec_security, 
 struct auth_session_info **session_info)
 {
+   if (!gensec_security-ops-session_info) {
+   return NT_STATUS_NOT_IMPLEMENTED;
+   }
return gensec_security-ops-session_info(gensec_security, session_info);
 }
 



svn commit: samba r1738 - branches/SAMBA_4_0/source/libcli/raw

2004-08-11 Thread tridge
Author: tridge
Date: 2004-08-11 21:09:36 + (Wed, 11 Aug 2004)
New Revision: 1738
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1738nolog=1
Log:
honor the unicode=yes/no option in the SMB client library

Modified:
   branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c 2004-08-11 21:06:11 UTC (rev 
1737)
+++ branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c 2004-08-11 21:09:36 UTC (rev 
1738)
@@ -53,7 +53,9 @@
}
 
flags2 |= FLAGS2_32_BIT_ERROR_CODES;
-   flags2 |= FLAGS2_UNICODE_STRINGS;
+   if (lp_unicode()) {
+   flags2 |= FLAGS2_UNICODE_STRINGS;
+   }
flags2 |= FLAGS2_EXTENDED_ATTRIBUTES;
flags2 |= FLAGS2_LONG_PATH_COMPONENTS;
flags2 |= FLAGS2_IS_LONG_NAME;
@@ -172,7 +174,7 @@
}
 
/* a way to force ascii SMB */
-   if (getenv(SMBCLI_FORCE_ASCII)) {
+   if (!lp_unicode() || getenv(SMBCLI_FORCE_ASCII)) {
transport-negotiate.capabilities = ~CAP_UNICODE;
}
 



svn commit: samba r1739 - branches/SAMBA_4_0/source/libcli/raw

2004-08-11 Thread tridge
Author: tridge
Date: 2004-08-11 21:10:16 + (Wed, 11 Aug 2004)
New Revision: 1739
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1739nolog=1
Log:
fixed the padding in setpathinfo, noticed when forcing negotiated ascii strings


Modified:
   branches/SAMBA_4_0/source/libcli/raw/rawsetfileinfo.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawsetfileinfo.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawsetfileinfo.c   2004-08-11 21:09:36 
UTC (rev 1738)
+++ branches/SAMBA_4_0/source/libcli/raw/rawsetfileinfo.c   2004-08-11 21:10:16 
UTC (rev 1739)
@@ -164,10 +164,10 @@
  Very raw set path info - takes data blob
 /
 static struct smbcli_request *smb_raw_setpathinfo_blob_send(struct smbcli_tree *tree,
-TALLOC_CTX *mem_ctx,
-const char *fname,
-uint16_t info_level,
-DATA_BLOB *blob)
+   TALLOC_CTX *mem_ctx,
+   const char *fname,
+   uint16_t info_level,
+   DATA_BLOB *blob)
 {
struct smb_trans2 tp;
uint16_t setup = TRANSACT2_SETPATHINFO;
@@ -180,15 +180,15 @@
tp.in.max_data = 0;
tp.in.setup = setup;

-   tp.in.params = data_blob_talloc(mem_ctx, NULL, 4);
+   tp.in.params = data_blob_talloc(mem_ctx, NULL, 6);
if (!tp.in.params.data) {
return NULL;
}
SSVAL(tp.in.params.data, 0, info_level);
-   SSVAL(tp.in.params.data, 2, 0);
+   SIVAL(tp.in.params.data, 2, 0);
smbcli_blob_append_string(tree-session, mem_ctx, 
-  tp.in.params,
-  fname, STR_TERMINATE);
+ tp.in.params,
+ fname, STR_TERMINATE);
 
tp.in.data = *blob;
 



svn commit: samba r1740 - in branches/SAMBA_4_0/source/torture: . raw

2004-08-11 Thread tridge
Author: tridge
Date: 2004-08-11 21:11:37 + (Wed, 11 Aug 2004)
New Revision: 1740
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/source/torturerev=1740nolog=1
Log:
fixed the torture suite for ASCII-only servers



Modified:
   branches/SAMBA_4_0/source/torture/raw/notify.c
   branches/SAMBA_4_0/source/torture/raw/qfileinfo.c
   branches/SAMBA_4_0/source/torture/raw/qfsinfo.c
   branches/SAMBA_4_0/source/torture/raw/search.c
   branches/SAMBA_4_0/source/torture/torture_util.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1742 - branches/SAMBA_4_0/source/librpc/idl

2004-08-11 Thread jelmer
Author: jelmer
Date: 2004-08-11 22:09:54 + (Wed, 11 Aug 2004)
New Revision: 1742
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1742nolog=1
Log:
Add the IDispatch interface

Modified:
   branches/SAMBA_4_0/source/librpc/idl/dcom.idl
   branches/SAMBA_4_0/source/librpc/idl/epmapper.idl

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1743 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-11 22:14:04 + (Wed, 11 Aug 2004)
New Revision: 1743
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1743nolog=1
Log:
Implementation of searching trust password by sid.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-11 22:09:54 UTC (rev 1742)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-11 22:14:04 UTC (rev 1743)
@@ -3613,8 +3613,40 @@
 
 static NTSTATUS ldapsam_gettrustpwsid(struct pdb_methods *methods, SAM_TRUST_PASSWD 
*trust, const DOM_SID *sid)
 {
-   NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
-   return nt_status;
+   struct ldapsam_privates *ldap_state = (struct 
ldapsam_privates*)methods-private_data;
+   int rc;
+   BOOL ret;
+   fstring sidstr;
+   pstring filter;
+   char **attr_list;
+   const char *attr_sid = get_attr_key2string(trustpw_attr_list, LDAP_ATTR_SID);
+
+   pstr_sprintf(filter, ((%s=%s)(objectclass=%s)), attr_sid,
+sid_to_string(sidstr, pdb_get_tp_domain_sid(trust)),
+LDAP_OBJ_TRUST_PASSWORD);
+
+   attr_list = get_attr_list(trustpw_attr_list);
+   rc = smbldap_search_suffix(ldap_state-smbldap_state, filter, attr_list,
+  ldap_state-result);
+   free_attr_list(attr_list);
+
+   if (rc != LDAP_SUCCESS) {
+   ldap_msgfree(ldap_state-result);
+   ldap_state-result = NULL;
+   return NT_STATUS_UNSUCCESSFUL;
+   }
+
+   ldap_state-entry = ldap_first_entry(ldap_state-smbldap_state-ldap_struct,
+ldap_state-result);
+   if (!ldap_state-entry)
+   return NT_STATUS_NOT_FOUND;
+
+   memset((void*)trust, 0, sizeof(*trust));
+   ret = init_trustpw_from_ldap(ldap_state, trust, ldap_state-entry);
+   if (ret)
+   return NT_STATUS_OK;
+   else
+   return NT_STATUS_UNSUCCESSFUL;
 }
 
 



svn commit: samba r1744 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-11 22:29:54 + (Wed, 11 Aug 2004)
New Revision: 1744
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1744nolog=1
Log:
More exact status codes returned and more precise way of forming
distinguished name of a ldap object being modified.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-11 22:14:04 UTC (rev 1743)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-11 22:29:54 UTC (rev 1744)
@@ -3759,7 +3759,7 @@
char **attr_list;
LDAPMessage *res = NULL;
LDAPMod **mod = NULL;
-   pstring dn;
+   char *dn = NULL;
int ldap_op;
int rc, count;
const char *dom_name;
@@ -3798,22 +3798,23 @@
  dom_name));
ldap_msgfree(res);
free_attr_list(attr_list);
-   return NT_STATUS_UNSUCCESSFUL;  /* TODO: find more suitable status 
code */
+   return NT_STATUS_NOT_FOUND;
 
} else if (count  1) {
DEBUG(0, (More than one (%d) trust passwords (%s) found in the 
directory!\n,
  count, dom_name));
ldap_msgfree(res);
free_attr_list(attr_list);
-   return NT_STATUS_UNSUCCESSFUL;  /* TODO: find more suitable status 
code */
+   return NT_STATUS_UNSUCCESSFUL;  /* I don't know of more suitable 
status code yet */
}
 
ldap_op = LDAP_MOD_REPLACE;
 
-   /* DN of the object being added */
-   snprintf(dn, sizeof(dn) - 1, %s=%s,%s=%s,%s, 
get_attr_key2string(trustpw_attr_list, LDAP_ATTR_DOMAIN),
-dom_name, get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOMAIN), 
lp_workgroup(),
-lp_ldap_suffix());
+   /* DN of the object being modified */
+   dn = smbldap_get_dn(ldap_state-smbldap_state-ldap_struct, res);
+   if (!dn) {
+   return NT_STATUS_UNSUCCESSFUL;
+   }
 
/* Init LDAP entry from trust password structure */
if (!init_ldap_from_trustpw(ldap_state, res, mod, trustpw)) {



svn commit: samba r1745 - in branches/SAMBA_4_0/source: include libcli/raw

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-12 00:04:52 + (Thu, 12 Aug 2004)
New Revision: 1745
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1745nolog=1
Log:
More work on cleaning up SMB signing.

This removes the function pointer mess from the SMB signing code.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/include/cli_context.h
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!



svn commit: samba r1746 - branches/SAMBA_4_0/source/libcli/raw

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-12 00:37:01 + (Thu, 12 Aug 2004)
New Revision: 1746
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1746nolog=1
Log:
Remove more cruft from the SMB signing code.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1747 - branches/SAMBA_4_0/source/smb_server

2004-08-11 Thread metze
Author: metze
Date: 2004-08-12 03:23:19 + (Thu, 12 Aug 2004)
New Revision: 1747
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1747nolog=1
Log:
don't segfault when the spnego mech only use one call from the client to finish

metze

Modified:
   branches/SAMBA_4_0/source/smb_server/sesssetup.c

Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/sesssetup.c
===
--- branches/SAMBA_4_0/source/smb_server/sesssetup.c2004-08-12 00:37:01 UTC (rev 
1746)
+++ branches/SAMBA_4_0/source/smb_server/sesssetup.c2004-08-12 03:23:19 UTC (rev 
1747)
@@ -212,25 +212,35 @@
 
}
 
+   if (!smb_sess) {
+   vuid = smbsrv_register_session(req-smb_conn, session_info, 
gensec_ctx);
+   if (vuid == UID_FIELD_INVALID) {
+   return NT_STATUS_ACCESS_DENIED;
+   }
+   smb_sess = smbsrv_session_find(req-smb_conn, vuid);
+   if (!smb_sess) {
+   return NT_STATUS_FOOBAR;
+   }
+   }
+
if (NT_STATUS_IS_OK(status)) {
DATA_BLOB session_key;
DATA_BLOB null_data_blob = data_blob(NULL, 0);
+   
status = gensec_session_info(smb_sess-gensec_ctx, 
smb_sess-session_info);
-   if (NT_STATUS_IS_OK(gensec_session_key(smb_sess-gensec_ctx, 
-  session_key))) {
+   if (!NT_STATUS_IS_OK(status)) {
+   return status;
+   }
+   
+   status = gensec_session_key(smb_sess-gensec_ctx, 
+  session_key);
+   if (NT_STATUS_IS_OK(status)) {
srv_setup_signing(req-smb_conn, session_key, 
null_data_blob);
req-seq_num = 0;
req-smb_conn-signing.next_seq_num = 2;
}
}
 
-   if (!smb_sess) {
-   vuid = smbsrv_register_session(req-smb_conn, session_info, 
gensec_ctx);
-   if (vuid == UID_FIELD_INVALID) {
-   return NT_STATUS_ACCESS_DENIED;
-   }
-   }
-
sess-spnego.out.action = 0;
sess-spnego.out.vuid = vuid;
sesssetup_common_strings(req, 



svn commit: samba r1748 - branches/SAMBA_4_0/source/libcli/auth

2004-08-11 Thread metze
Author: metze
Date: 2004-08-12 03:26:38 + (Thu, 12 Aug 2004)
New Revision: 1748
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1748nolog=1
Log:
don't segfault if there's no ticket

metze

Modified:
   branches/SAMBA_4_0/source/libcli/auth/clikrb5.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/clikrb5.c
===
--- branches/SAMBA_4_0/source/libcli/auth/clikrb5.c 2004-08-12 03:23:19 UTC (rev 
1747)
+++ branches/SAMBA_4_0/source/libcli/auth/clikrb5.c 2004-08-12 03:26:38 UTC (rev 
1748)
@@ -154,11 +154,11 @@
DATA_BLOB *auth_data, krb5_ticket *tkt)
 {
 #if defined(HAVE_KRB5_TKT_ENC_PART2)
-   if (tkt-enc_part2)
+   if (tkt  tkt-enc_part2)
*auth_data = data_blob(tkt-enc_part2-authorization_data[0]-contents,
tkt-enc_part2-authorization_data[0]-length);
 #else
-   if (tkt-ticket.authorization_data  tkt-ticket.authorization_data-len)
+   if (tkt  tkt-ticket.authorization_data  
tkt-ticket.authorization_data-len)
*auth_data = 
data_blob(tkt-ticket.authorization_data-val-ad_data.data,
tkt-ticket.authorization_data-val-ad_data.length);
 #endif



svn commit: samba r1749 - branches/SAMBA_4_0/source/lib/ldb/tests

2004-08-11 Thread tridge
Author: tridge
Date: 2004-08-12 03:28:44 + (Thu, 12 Aug 2004)
New Revision: 1749
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1749nolog=1
Log:
added some random stuff that captures some discussions volker and I
just had on emulating % macros from smb.conf in a possible ldb based
config system

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tests/test-config.ldif

Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-config.ldif
===
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-config.ldif2004-08-12 03:26:38 
UTC (rev 1748)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-config.ldif2004-08-12 03:28:44 
UTC (rev 1749)
@@ -2,6 +2,17 @@
 # global configuration options
 dn: cn=Global,cn=Config,cn=Samba
 objectclass: globalconfig
+LocalConfigCn: cn=%U,cn=Config,cn=Samba
+LocalConfigCn;1: cn=%U,cn=Config,cn=Samba
+LocalConfigCn;2: cn=%I,cn=Config,cn=Samba
+LocalConfigCn;3: cn=%M,cn=Config,cn=Samba
+
+#
+dn: cn=Protocol,cn=Global,cn=Config,cn=Samba
+maxXmit: 7000
+
+
+dn: cn=Volker,cn=Config,cn=Samba
 Workgroup: VNET3
 UnixCharset: UTF8
 Security: user
@@ -9,6 +20,17 @@
 NetbiosName: blu
 GuestAccount: tridge
 
+#
+dn: cn=Volker,cn=Config,cn=Samba
+Workgroup: VNET3
+UnixCharset: UTF8
+Security: user
+Interfaces: vmnet* eth*
+NetbiosName: blu
+GuestAccount: tridge
+Include: cn=%U,cn=MyConfig,cn=Config,cn=Samba
+
+   ((objectClass=fileshare)(cn=test))
 ##
 # [test] share
 dn: cn=test,cn=Shares,cn=Config,cn=Samba



svn commit: samba r1750 - branches/SAMBA_3_0/source/utils

2004-08-11 Thread jmcd
Author: jmcd
Date: 2004-08-12 03:28:57 + (Thu, 12 Aug 2004)
New Revision: 1750
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1750nolog=1
Log:
This patch allows net ads lookup to rely on command line arguments if contacting an 
ADS server fails.  This allows net ads lookup to work with clapd (very useful for 
testing).
 
from [EMAIL PROTECTED]


Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c
   branches/SAMBA_3_0/source/utils/net_ads_cldap.c

Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===
--- branches/SAMBA_3_0/source/utils/net_ads.c   2004-08-12 03:28:44 UTC (rev 1749)
+++ branches/SAMBA_3_0/source/utils/net_ads.c   2004-08-12 03:28:57 UTC (rev 1750)
@@ -77,9 +77,12 @@
 
ads_connect(ads);
 
-   if (!ads || !ads-config.realm) {
+   if (!ads) {
d_printf(Didn't find the cldap server!\n);
return -1;
+   } if (!ads-config.realm) {
+   ads-config.realm = opt_target_workgroup;
+   ads-ldap_port = 389;
}
 
return ads_cldap_netlogon(ads);

Modified: branches/SAMBA_3_0/source/utils/net_ads_cldap.c
===
--- branches/SAMBA_3_0/source/utils/net_ads_cldap.c 2004-08-12 03:28:44 UTC (rev 
1749)
+++ branches/SAMBA_3_0/source/utils/net_ads_cldap.c 2004-08-12 03:28:57 UTC (rev 
1750)
@@ -280,8 +280,9 @@
int sock;
int ret;
struct cldap_netlogon_reply reply;
+   const char *target = opt_host ? opt_host : inet_ntoa(ads-ldap_ip);
 
-   sock = open_udp_socket(inet_ntoa(ads-ldap_ip), ads-ldap_port);
+   sock = open_udp_socket(target, ads-ldap_port);
if (sock == -1) {
d_printf(Failed to open udp socket to %s:%u\n, 
 inet_ntoa(ads-ldap_ip), 



svn commit: samba r1751 - trunk/source/utils

2004-08-11 Thread jmcd
Author: jmcd
Date: 2004-08-12 03:35:20 + (Thu, 12 Aug 2004)
New Revision: 1751
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1751nolog=1
Log:
This patch allows net ads lookup to rely on command line arguments if contacting an 
ADS server fails.  This allows net ads lookup to work with clapd (very useful for 
testing).
 
from [EMAIL PROTECTED]


Modified:
   trunk/source/utils/net_ads.c
   trunk/source/utils/net_ads_cldap.c

Changeset:
Modified: trunk/source/utils/net_ads.c
===
--- trunk/source/utils/net_ads.c2004-08-12 03:28:57 UTC (rev 1750)
+++ trunk/source/utils/net_ads.c2004-08-12 03:35:20 UTC (rev 1751)
@@ -75,9 +75,12 @@
 
ads_connect(ads);
 
-   if (!ads || !ads-config.realm) {
+   if (!ads) {
d_printf(Didn't find the cldap server!\n);
return -1;
+   } if (!ads-config.realm) {
+   ads-config.realm = opt_target_workgroup;
+   ads-ldap_port = 389;
}
 
return ads_cldap_netlogon(ads);

Modified: trunk/source/utils/net_ads_cldap.c
===
--- trunk/source/utils/net_ads_cldap.c  2004-08-12 03:28:57 UTC (rev 1750)
+++ trunk/source/utils/net_ads_cldap.c  2004-08-12 03:35:20 UTC (rev 1751)
@@ -280,8 +280,9 @@
int sock;
int ret;
struct cldap_netlogon_reply reply;
+   const char *target = opt_host ? opt_host : inet_ntoa(ads-ldap_ip);
 
-   sock = open_udp_socket(inet_ntoa(ads-ldap_ip), ads-ldap_port);
+   sock = open_udp_socket(target, ads-ldap_port);
if (sock == -1) {
d_printf(Failed to open udp socket to %s:%u\n, 
 inet_ntoa(ads-ldap_ip), 



svn commit: samba r1752 - branches/SAMBA_4_0/source/libcli/auth

2004-08-11 Thread abartlet
Author: abartlet
Date: 2004-08-12 03:35:38 + (Thu, 12 Aug 2004)
New Revision: 1752
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1752nolog=1
Log:
Fix compile bugs on C (rather than C++) tolerant compilers.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/spnego.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/spnego.c
===
--- branches/SAMBA_4_0/source/libcli/auth/spnego.c  2004-08-12 03:35:20 UTC (rev 
1751)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego.c  2004-08-12 03:35:38 UTC (rev 
1752)
@@ -285,6 +285,7 @@
  TALLOC_CTX *out_mem_ctx, 
  const DATA_BLOB in, DATA_BLOB *out) 
 {
+   DATA_BLOB null_data_blob = data_blob(NULL,0);
NTSTATUS nt_status;
int num_ops;
const char **mechTypes = NULL;
@@ -301,7 +302,6 @@
DEBUG(1, (no GENSEC OID backends available\n));
return NT_STATUS_INVALID_PARAMETER;
}
-   DATA_BLOB null_data_blob = data_blob(NULL,0);
 
nt_status = gensec_subcontext_start(gensec_security, 
spnego_state-sub_sec_security);



svn commit: samba r1753 - in trunk/examples: . smbconf_edit

2004-08-11 Thread jmcd
Author: jmcd
Date: 2004-08-12 03:49:17 + (Thu, 12 Aug 2004)
New Revision: 1753
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/trunk/examplesrev=1753nolog=1
Log:
A commandline tool for modifying smb.conf.   preserves order and comments.

written by [EMAIL PROTECTED]

Added:
   trunk/examples/smbconf_edit/
   trunk/examples/smbconf_edit/COPYING
   trunk/examples/smbconf_edit/Makefile
   trunk/examples/smbconf_edit/README
   trunk/examples/smbconf_edit/basic_lexer.cpp
   trunk/examples/smbconf_edit/basic_lexer.hpp
   trunk/examples/smbconf_edit/main.cpp
   trunk/examples/smbconf_edit/smbconf.cpp
   trunk/examples/smbconf_edit/smbconf.hpp
   trunk/examples/smbconf_edit/smbconf_lexer.hpp

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


Re: svn commit: samba r1720 - branches/SAMBA_3_0/source/utils trunk/source/utils

2004-08-11 Thread Rafal Szczesniak
On Wed, Aug 11, 2004 at 01:41:14PM +0200, Volker Lendecke wrote:
 On Wed, Aug 11, 2004 at 09:32:32AM +, [EMAIL PROTECTED] wrote:
 branches/SAMBA_3_0/source/utils/net_groupmap.c
 trunk/source/utils/net_groupmap.c
 
 Wait a minute -- how did you set up your tree to be able to do a combined
 commit???

You can easily checkout the whole samba svn tree witch all branches
under in subdirectory (as Guenter have pointed out). It's a nice feature
compared to cvs.


cheers,
-- 
Rafal Szczesniak
Samba Team member  http://www.samba.org



signature.asc
Description: Digital signature


Re: svn commit: samba r1720 - branches/SAMBA_3_0/source/utils trunk/source/utils

2004-08-11 Thread Rafal Szczesniak
On Wed, Aug 11, 2004 at 06:21:00PM +0200, Volker Lendecke wrote:
 On Wed, Aug 11, 2004 at 01:59:46PM +0200, Guenther Deschner wrote:
  quite easy: I just checked out $SERVER/samba and below samba I call 
 
 Ok, I did not do this quite yet as this probably is huge :-)

Not so horrible, but growing fast as you've joined the 3.2-merge efforts
:-)

Besides, we're in US, so take an opportunity to use fast links ;)


cheers,
-- 
Rafal Szczesniak
Samba Team member  http://www.samba.org



signature.asc
Description: Digital signature


svn commit: samba r1754 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-12 04:44:21 + (Thu, 12 Aug 2004)
New Revision: 1754
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1754nolog=1
Log:
Doxygen comment about gettrustpwsid function.


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-12 03:49:17 UTC (rev 1753)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-12 04:44:21 UTC (rev 1754)
@@ -3611,6 +3611,15 @@
 }
 
 
+/**
+ * Looks up trust password by domain sid.
+ *
+ * @param methods passdb backend methods related to current context
+ * @param trust trust password structure used by password backend
+ * @param sid trust password's domain sid
+ * @return nt status code of operation
+ */
+
 static NTSTATUS ldapsam_gettrustpwsid(struct pdb_methods *methods, SAM_TRUST_PASSWD 
*trust, const DOM_SID *sid)
 {
struct ldapsam_privates *ldap_state = (struct 
ldapsam_privates*)methods-private_data;



svn commit: samba r1755 - trunk/source/passdb

2004-08-11 Thread mimir
Author: mimir
Date: 2004-08-12 04:49:07 + (Thu, 12 Aug 2004)
New Revision: 1755
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/rev=1755nolog=1
Log:
One bit I haven't removed after testing...


rafal


Modified:
   trunk/source/passdb/pdb_ldap.c

Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===
--- trunk/source/passdb/pdb_ldap.c  2004-08-12 04:44:21 UTC (rev 1754)
+++ trunk/source/passdb/pdb_ldap.c  2004-08-12 04:49:07 UTC (rev 1755)
@@ -3650,7 +3650,6 @@
if (!ldap_state-entry)
return NT_STATUS_NOT_FOUND;
 
-   memset((void*)trust, 0, sizeof(*trust));
ret = init_trustpw_from_ldap(ldap_state, trust, ldap_state-entry);
if (ret)
return NT_STATUS_OK;



svn commit: samba r1756 - in branches/SAMBA_4_0/source: . include libcli libcli/ldap libcli/util

2004-08-11 Thread metze
Author: metze
Date: 2004-08-12 04:55:59 + (Thu, 12 Aug 2004)
New Revision: 1756
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1756nolog=1
Log:
merge volkers ldap client lib to samba4 for simo to start with the 
ldap server code

it's not compiled in yet...

metze

Added:
   branches/SAMBA_4_0/source/libcli/ldap/
   branches/SAMBA_4_0/source/libcli/ldap/config.m4
   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
Modified:
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/include/asn_1.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/libcli/util/asn1.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!


svn commit: samba r1757 - in branches/SAMBA_4_0/source: build/pidl librpc/ndr rpc_server

2004-08-11 Thread tridge
Author: tridge
Date: 2004-08-12 05:15:41 + (Thu, 12 Aug 2004)
New Revision: 1757
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=sambapath=/branches/SAMBA_4_0/sourcerev=1757nolog=1
Log:
much simpler (and smaller, faster etc) way of doing relative pointers
in pidl. This mechanism should be much easier to extend to the
retrospective subcontexts that jelmer needs.

also produced more standards complient full-pointer offsets. This
keeps ethereal happy with decoding our epmapper frames.

Modified:
   branches/SAMBA_4_0/source/build/pidl/parser.pm
   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/rpc_server/dcerpc_server.c

Changeset:
Sorry the patch is to large, please use WebSVN to see it!