svn commit: samba r24647 - in branches/SAMBA_4_0/source: .
Author: tridge Date: 2007-08-24 06:10:16 + (Fri, 24 Aug 2007) New Revision: 24647 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24647 Log: this passes now Modified: branches/SAMBA_4_0/source/samba4-knownfail Changeset: Modified: branches/SAMBA_4_0/source/samba4-knownfail === --- branches/SAMBA_4_0/source/samba4-knownfail 2007-08-24 03:40:40 UTC (rev 24646) +++ branches/SAMBA_4_0/source/samba4-knownfail 2007-08-24 06:10:16 UTC (rev 24647) @@ -9,4 +9,3 @@ RPC-WKSSVC.*NetWkstaGetInfo RPC-WKSSVC.*NetWkstaTransportEnum blackbox.smbclient.*USER.*PASSWD -RAW-SAMBA3CASEINSENSITIVE
svn commit: samba r24648 - in branches/SAMBA_4_0/source/dsdb/common: .
Author: abartlet Date: 2007-08-24 06:29:20 + (Fri, 24 Aug 2007) New Revision: 24648 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24648 Log: Found out the meaning of a few more flags. Modified: branches/SAMBA_4_0/source/dsdb/common/flags.h Changeset: Modified: branches/SAMBA_4_0/source/dsdb/common/flags.h === --- branches/SAMBA_4_0/source/dsdb/common/flags.h 2007-08-24 06:10:16 UTC (rev 24647) +++ branches/SAMBA_4_0/source/dsdb/common/flags.h 2007-08-24 06:29:20 UTC (rev 24648) @@ -19,7 +19,7 @@ */ /* UserFlags for userAccountControl */ -#define UF_SCRIPT 0x0001 +#define UF_SCRIPT 0x0001 /* NT or Lan Manager Login script must be executed */ #define UF_ACCOUNTDISABLE 0x0002 #define UF_00040x0004 #define UF_HOMEDIR_REQUIRED0x0008 @@ -29,7 +29,7 @@ #define UF_PASSWD_CANT_CHANGE 0x0040 #define UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED 0x0080 -#define UF_TEMP_DUPLICATE_ACCOUNT 0x0100 +#define UF_TEMP_DUPLICATE_ACCOUNT 0x0100 /* Local user account in usrmgr */ #define UF_NORMAL_ACCOUNT 0x0200 #define UF_04000x0400 #define UF_INTERDOMAIN_TRUST_ACCOUNT 0x0800
svn commit: samba r24649 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
Author: vlendec
Date: 2007-08-24 11:25:38 + (Fri, 24 Aug 2007)
New Revision: 24649
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24649
Log:
Attempt to fix bug 4917. Simo, please check!
Thanks Patrick Rynhart for reporting this.
Modified:
branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c 2007-08-24 06:29:20 UTC
(rev 24648)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c 2007-08-24 11:25:38 UTC
(rev 24649)
@@ -894,7 +894,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
@@ -,7 +,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
Modified: branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-08-24 06:29:20 UTC
(rev 24648)
+++ branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c 2007-08-24 11:25:38 UTC
(rev 24649)
@@ -896,7 +896,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
@@ -1113,7 +1113,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
Modified: branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c 2007-08-24 06:29:20 UTC
(rev 24648)
+++ branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c 2007-08-24 11:25:38 UTC
(rev 24649)
@@ -893,7 +893,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
@@ -1110,7 +1110,7 @@
uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
- attr_list = get_attr_list(ctx, sidmap_attr_list);
+ attr_list = get_attr_list(memctx, sidmap_attr_list);
if ( ! ids[1]) {
/* if we are requested just one mapping use the simple filter */
Re: svn commit: samba r24649 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
On Fri, 2007-08-24 at 11:25 +, [EMAIL PROTECTED] wrote: Log: Attempt to fix bug 4917. Simo, please check! Thanks Patrick Rynhart for reporting this. Oh thanks for this fix, looks good. This must have been a huge memory leak on long running winbindd processes. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org
svn commit: samba r24650 - in branches/SAMBA_4_0/source/setup: .
Author: idra
Date: 2007-08-24 13:21:43 + (Fri, 24 Aug 2007)
New Revision: 24650
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24650
Log:
Some more instructions to have make GSS-TSIG work
Modified:
branches/SAMBA_4_0/source/setup/named.conf
Changeset:
Modified: branches/SAMBA_4_0/source/setup/named.conf
===
--- branches/SAMBA_4_0/source/setup/named.conf 2007-08-24 11:25:38 UTC (rev
24649)
+++ branches/SAMBA_4_0/source/setup/named.conf 2007-08-24 13:21:43 UTC (rev
24650)
@@ -1,10 +1,22 @@
#
-# Insert this snippit into your named.conf or bind.conf to configure
+# Insert these snippets into your named.conf or bind.conf to configure
# the BIND nameserver.
#
+#insert this into options {}
+tkey-gssapi-credential DNS/${DNSDOMAIN}
+tkey-domain ${REALM};
+
+#the zone file
zone ${DNSDOMAIN}. IN {
type master;
file ${DNSDOMAIN}.zone;
};
+# Also, you need to change your init scripts to set this environment variable
+# for named: KRB_KTNAME so that it points to the keytab generated.
+# In RedHat derived systems such RHEL/CentOS/Fedora you can add the following
+# line to the /etc/sysconfig/named file
+# export KRB_KTNAME=/etc/named.keytab
+
+# *TODO*: generate and install a keytab file in /etc/named.keytab
svn commit: samba r24651 - in branches/SAMBA_4_0/source/setup: .
Author: idra
Date: 2007-08-24 13:31:05 + (Fri, 24 Aug 2007)
New Revision: 24651
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24651
Log:
Allow dynamic updates for the domain controller over its own name
Modified:
branches/SAMBA_4_0/source/setup/named.conf
Changeset:
Modified: branches/SAMBA_4_0/source/setup/named.conf
===
--- branches/SAMBA_4_0/source/setup/named.conf 2007-08-24 13:21:43 UTC (rev
24650)
+++ branches/SAMBA_4_0/source/setup/named.conf 2007-08-24 13:31:05 UTC (rev
24651)
@@ -11,6 +11,11 @@
zone ${DNSDOMAIN}. IN {
type master;
file ${DNSDOMAIN}.zone;
+ update-policy {
+ /* use ANY only for Domain controllers for now */
+ /* for normal machines A PTR is probbaly all is needed */
+ grant [EMAIL PROTECTED] name ${HOSTNAME}.${DNSDOMAIN} ANY;
+ };
};
# Also, you need to change your init scripts to set this environment variable
svn commit: samba r24652 - in branches/SAMBA_3_2_0/source/lib/tdb/common: .
Author: vlendec
Date: 2007-08-24 14:36:13 + (Fri, 24 Aug 2007)
New Revision: 24652
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24652
Log:
Janitor for jelmer, merge r24340:
Use standard data type uint32_t rather than tdb-specific u32.
Modified:
branches/SAMBA_3_2_0/source/lib/tdb/common/error.c
branches/SAMBA_3_2_0/source/lib/tdb/common/io.c
branches/SAMBA_3_2_0/source/lib/tdb/common/lock.c
branches/SAMBA_3_2_0/source/lib/tdb/common/open.c
branches/SAMBA_3_2_0/source/lib/tdb/common/tdb.c
branches/SAMBA_3_2_0/source/lib/tdb/common/tdb_private.h
branches/SAMBA_3_2_0/source/lib/tdb/common/transaction.c
branches/SAMBA_3_2_0/source/lib/tdb/common/traverse.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/lib/tdb/common/error.c
===
--- branches/SAMBA_3_2_0/source/lib/tdb/common/error.c 2007-08-24 13:31:05 UTC
(rev 24651)
+++ branches/SAMBA_3_2_0/source/lib/tdb/common/error.c 2007-08-24 14:36:13 UTC
(rev 24652)
@@ -48,7 +48,7 @@
/* Error string for the last tdb error */
const char *tdb_errorstr(struct tdb_context *tdb)
{
- u32 i;
+ uint32_t i;
for (i = 0; i sizeof(emap) / sizeof(struct tdb_errname); i++)
if (tdb-ecode == emap[i].ecode)
return emap[i].estring;
Modified: branches/SAMBA_3_2_0/source/lib/tdb/common/io.c
===
--- branches/SAMBA_3_2_0/source/lib/tdb/common/io.c 2007-08-24 13:31:05 UTC
(rev 24651)
+++ branches/SAMBA_3_2_0/source/lib/tdb/common/io.c 2007-08-24 14:36:13 UTC
(rev 24652)
@@ -99,9 +99,9 @@
}
/* Endian conversion: we only ever deal with 4 byte quantities */
-void *tdb_convert(void *buf, u32 size)
+void *tdb_convert(void *buf, uint32_t size)
{
- u32 i, *p = (u32 *)buf;
+ uint32_t i, *p = (uint32_t *)buf;
for (i = 0; i size / 4; i++)
p[i] = TDB_BYTEREV(p[i]);
return buf;
@@ -142,17 +142,17 @@
do an unlocked scan of the hash table heads to find the next non-zero head.
The value
will then be confirmed with the lock held
*/
-static void tdb_next_hash_chain(struct tdb_context *tdb, u32 *chain)
+static void tdb_next_hash_chain(struct tdb_context *tdb, uint32_t *chain)
{
- u32 h = *chain;
+ uint32_t h = *chain;
if (tdb-map_ptr) {
for (;h tdb-header.hash_size;h++) {
- if (0 != *(u32 *)(TDB_HASH_TOP(h) + (unsigned char
*)tdb-map_ptr)) {
+ if (0 != *(uint32_t *)(TDB_HASH_TOP(h) + (unsigned char
*)tdb-map_ptr)) {
break;
}
}
} else {
- u32 off=0;
+ uint32_t off=0;
for (;h tdb-header.hash_size;h++) {
if (tdb_ofs_read(tdb, TDB_HASH_TOP(h), off) != 0 ||
off != 0) {
break;
Modified: branches/SAMBA_3_2_0/source/lib/tdb/common/lock.c
===
--- branches/SAMBA_3_2_0/source/lib/tdb/common/lock.c 2007-08-24 13:31:05 UTC
(rev 24651)
+++ branches/SAMBA_3_2_0/source/lib/tdb/common/lock.c 2007-08-24 14:36:13 UTC
(rev 24652)
@@ -400,7 +400,7 @@
int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off)
{
struct tdb_traverse_lock *i;
- u32 count = 0;
+ uint32_t count = 0;
if (off == 0)
return 0;
Modified: branches/SAMBA_3_2_0/source/lib/tdb/common/open.c
===
--- branches/SAMBA_3_2_0/source/lib/tdb/common/open.c 2007-08-24 13:31:05 UTC
(rev 24651)
+++ branches/SAMBA_3_2_0/source/lib/tdb/common/open.c 2007-08-24 14:36:13 UTC
(rev 24652)
@@ -34,8 +34,8 @@
/* This is based on the hash algorithm from gdbm */
static unsigned int default_tdb_hash(TDB_DATA *key)
{
- u32 value; /* Used to compute the hash value. */
- u32 i;/* Used to cycle through random values. */
+ uint32_t value; /* Used to compute the hash value. */
+ uint32_t i; /* Used to cycle through random values. */
/* Set the initial value from the key size. */
for (value = 0x238F13AF * key-dsize, i=0; i key-dsize; i++)
@@ -151,7 +151,7 @@
struct stat st;
int rev = 0, locked = 0;
unsigned char *vp;
- u32 vertest;
+ uint32_t vertest;
if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
/* Can't log this */
@@ -249,8 +249,8 @@
rev = (tdb-flags TDB_CONVERT);
}
vp = (unsigned char *)tdb-header.version;
- vertest = (((u32)vp[0]) 24) | (((u32)vp[1]) 16) |
- (((u32)vp[2]) 8) | (u32)vp[3];
+ vertest = (((uint32_t)vp[0]) 24) | (((uint32_t)vp[1]) 16) |
+ (((uint32_t)vp[2]) 8) |
svn commit: samba r24653 - in branches/SAMBA_3_2_0/source: include lib libads libsmb rpc_client smbd
Author: vlendec
Date: 2007-08-24 15:00:26 + (Fri, 24 Aug 2007)
New Revision: 24653
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24653
Log:
Some trivial 3_2-3_2_0 merges
Modified:
branches/SAMBA_3_2_0/source/include/client.h
branches/SAMBA_3_2_0/source/include/ntdomain.h
branches/SAMBA_3_2_0/source/include/rpc_samr.h
branches/SAMBA_3_2_0/source/include/trans2.h
branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
branches/SAMBA_3_2_0/source/lib/util_sock.c
branches/SAMBA_3_2_0/source/libads/ads_status.c
branches/SAMBA_3_2_0/source/libsmb/clispnego.c
branches/SAMBA_3_2_0/source/libsmb/smb_signing.c
branches/SAMBA_3_2_0/source/rpc_client/cli_pipe.c
branches/SAMBA_3_2_0/source/smbd/lanman.c
branches/SAMBA_3_2_0/source/smbd/msdfs.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/include/client.h
===
--- branches/SAMBA_3_2_0/source/include/client.h2007-08-24 14:36:13 UTC
(rev 24652)
+++ branches/SAMBA_3_2_0/source/include/client.h2007-08-24 15:00:26 UTC
(rev 24653)
@@ -34,8 +34,7 @@
* These definitions depend on smb.h
*/
-struct print_job_info
-{
+struct print_job_info {
uint16 id;
uint16 priority;
size_t size;
Modified: branches/SAMBA_3_2_0/source/include/ntdomain.h
===
--- branches/SAMBA_3_2_0/source/include/ntdomain.h 2007-08-24 14:36:13 UTC
(rev 24652)
+++ branches/SAMBA_3_2_0/source/include/ntdomain.h 2007-08-24 15:00:26 UTC
(rev 24653)
@@ -264,7 +264,7 @@
*/
BOOL bad_handle_fault_state;
-
+
/*
* Set to true when the backend does not support a call.
*/
Modified: branches/SAMBA_3_2_0/source/include/rpc_samr.h
===
--- branches/SAMBA_3_2_0/source/include/rpc_samr.h 2007-08-24 14:36:13 UTC
(rev 24652)
+++ branches/SAMBA_3_2_0/source/include/rpc_samr.h 2007-08-24 15:00:26 UTC
(rev 24653)
@@ -288,7 +288,6 @@
UNISTR2 uni_comment;
UNISTR2 uni_munged_dial ; /* munged path name and dial-back tel no */
LOGON_HRS logon_hrs;
-
} SAM_USER_INFO_25;
/* SAM_USER_INFO_26 */
Modified: branches/SAMBA_3_2_0/source/include/trans2.h
===
--- branches/SAMBA_3_2_0/source/include/trans2.h2007-08-24 14:36:13 UTC
(rev 24652)
+++ branches/SAMBA_3_2_0/source/include/trans2.h2007-08-24 15:00:26 UTC
(rev 24653)
@@ -552,6 +552,21 @@
(NB statfs field flags can come from FILE_SYSTEM_DEVICE_INFO call)
*/
+#define SMB_QUERY_POSIX_WHO_AM_I 0x202 /* QFS Info */
+/* returns:
+__u32 flags; 0 = Authenticated user 1 = GUEST
+__u32 mask; which flags bits server understands ie 0x0001
+__u64 unix_user_id;
+__u64 unix_user_gid;
+__u32 number_of_supplementary_gids; may be zero
+__u32 number_of_sids; may be zero
+__u32 length_of_sid_array; in bytes - may be zero
+__u32 pad; reserved - MBZ
+__u64 gid_array[0]; may be empty
+__u8 * psid_list may be empty
+*/
+
+
/* ... more as we think of them :-). */
/* SMB POSIX ACL definitions. */
Modified: branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c
===
--- branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c2007-08-24 14:36:13 UTC
(rev 24652)
+++ branches/SAMBA_3_2_0/source/lib/dbwrap_tdb.c2007-08-24 15:00:26 UTC
(rev 24653)
@@ -57,8 +57,7 @@
}
result-key.dsize = key.dsize;
- result-key.dptr = (unsigned char *)talloc_memdup(result, key.dptr,
- key.dsize);
+ result-key.dptr = (uint8 *)talloc_memdup(result, key.dptr, key.dsize);
if (result-key.dptr == NULL) {
DEBUG(0, (talloc failed\n));
TALLOC_FREE(result);
@@ -92,8 +91,8 @@
}
result-value.dsize = value.dsize;
- result-value.dptr = (unsigned char *)talloc_memdup(result, value.dptr,
- value.dsize);
+ result-value.dptr = (uint8 *)talloc_memdup(result, value.dptr,
+ value.dsize);
if (result-value.dptr == NULL) {
DEBUG(3, (talloc failed\n));
TALLOC_FREE(result);
Modified: branches/SAMBA_3_2_0/source/lib/util_sock.c
===
--- branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-08-24 14:36:13 UTC (rev
24652)
+++ branches/SAMBA_3_2_0/source/lib/util_sock.c 2007-08-24 15:00:26 UTC (rev
24653)
@@ -744,12 +744,13 @@
/* Check the incoming SMB signature. */
if (!srv_check_sign_mac(buffer, True)) {
DEBUG(0, (receive_smb: SMB
svn commit: samba r24654 - in branches: SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads
Author: gd
Date: 2007-08-24 15:50:12 + (Fri, 24 Aug 2007)
New Revision: 24654
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24654
Log:
Adapt to coding conventions.
Guenther
Modified:
branches/SAMBA_3_2/source/libads/smb_krb5_locator.c
branches/SAMBA_3_2_0/source/libads/smb_krb5_locator.c
Changeset:
Modified: branches/SAMBA_3_2/source/libads/smb_krb5_locator.c
===
--- branches/SAMBA_3_2/source/libads/smb_krb5_locator.c 2007-08-24 15:00:26 UTC
(rev 24653)
+++ branches/SAMBA_3_2/source/libads/smb_krb5_locator.c 2007-08-24 15:50:12 UTC
(rev 24654)
@@ -1,18 +1,18 @@
-/*
+/*
Unix SMB/CIFS implementation.
kerberos locator plugin
Copyright (C) Guenther Deschner 2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
@@ -92,7 +92,7 @@
/**
* Check input parameters, return KRB5_PLUGIN_NO_HANDLE for unsupported ones
*
- * @param svc
+ * @param svc
* @param realm string
* @param socktype integer
* @param family integer
@@ -163,7 +163,7 @@
* @return krb5_error_code.
*/
-static krb5_error_code smb_krb5_locator_call_cbfunc(const char *name,
+static krb5_error_code smb_krb5_locator_call_cbfunc(const char *name,
const char *service,
struct addrinfo *in,
int (*cbfunc)(void *, int,
struct sockaddr *),
@@ -185,7 +185,7 @@
continue;
}
- DEBUG(10,(smb_krb5_locator_lookup: got ret: %s (%d)\n,
+ DEBUG(10,(smb_krb5_locator_lookup: got ret: %s (%d)\n,
gai_strerror(ret), ret));
#ifdef KRB5_PLUGIN_NO_HANDLE
return KRB5_PLUGIN_NO_HANDLE;
@@ -196,7 +196,8 @@
ret = cbfunc(cbdata, out-ai_socktype, out-ai_addr);
if (ret) {
- DEBUG(10,(smb_krb5_locator_lookup: failed to call callback: %s
(%d)\n,
+ DEBUG(10,(smb_krb5_locator_lookup:
+ failed to call callback: %s (%d)\n,
error_message(ret), ret));
}
@@ -214,7 +215,7 @@
* @return krb5_error_code.
*/
-krb5_error_code smb_krb5_locator_init(krb5_context context,
+krb5_error_code smb_krb5_locator_init(krb5_context context,
void **private_data)
{
setup_logging(smb_krb5_locator, True);
@@ -270,18 +271,20 @@
int count = 0;
struct addrinfo aihints;
char *saf_name = NULL;
+ const char *service = get_service_from_locate_service_type(svc);
int i;
DEBUG(10,(smb_krb5_locator_lookup: called for\n));
- DEBUGADD(10,(\tsvc: %s (%d), realm: %s\n,
+ DEBUGADD(10,(\tsvc: %s (%d), realm: %s\n,
locate_service_type_name(svc), svc, realm));
- DEBUGADD(10,(\tsocktype: %s (%d), family: %s (%d)\n,
+ DEBUGADD(10,(\tsocktype: %s (%d), family: %s (%d)\n,
socktype_name(socktype), socktype,
family_name(family), family));
- ret = smb_krb5_locator_lookup_sanity_check(svc, realm, socktype,
family);
+ ret = smb_krb5_locator_lookup_sanity_check(svc, realm, socktype,
+ family);
if (ret) {
- DEBUG(10,(smb_krb5_locator_lookup: returning ret: %s (%d)\n,
+ DEBUG(10,(smb_krb5_locator_lookup: returning ret: %s (%d)\n,
error_message(ret), ret));
return ret;
}
@@ -290,22 +293,23 @@
saf_name = saf_fetch(realm);
if (!saf_name || strlen(saf_name) == 0) {
- DEBUG(10,(smb_krb5_locator_lookup: no SAF name stored for
%s\n,
+ DEBUG(10,(smb_krb5_locator_lookup:
+ no SAF name stored for %s\n,
realm));
goto find_kdc;
}
- DEBUG(10,(smb_krb5_locator_lookup: got %s for %s from SAF cache\n,
+ DEBUG(10,(smb_krb5_locator_lookup: got %s for %s from SAF cache\n,
saf_name, realm));
ZERO_STRUCT(aihints);
-
+
aihints.ai_family = family;
aihints.ai_socktype = socktype;
- ret = smb_krb5_locator_call_cbfunc(saf_name,
-
svn commit: samba r24655 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: abartlet
Date: 2007-08-24 22:58:29 + (Fri, 24 Aug 2007)
New Revision: 24655
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24655
Log:
Fix bug 4919 reported by Matthias Walln?\195?\182fer [EMAIL PROTECTED]:
When you change to the SAMBA private directory on a shell (default
/usr/local/samba/private) and start there for example ldbedit with the
sam.ldb,
the application crashes if you don't put the ./ before the filename.
I've adapted Matthias's patch.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-08-24 15:50:12 UTC (rev 24654)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
2007-08-24 22:58:29 UTC (rev 24655)
@@ -722,11 +722,10 @@
}
if ( (p = strrchr(path, '/')) != NULL) {
p[0] = '\0';
+ full_name = talloc_asprintf(mem_ctx, %s/%s, path, name);
} else {
- talloc_free(path);
- return NULL;
+ full_name = talloc_asprintf(mem_ctx, ./%s, name);
}
- full_name = talloc_asprintf(mem_ctx, %s/%s, path, name);
talloc_free(path);
return full_name;
}
Build status as of Sat Aug 25 00:00:01 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-08-24 00:01:50.0 + +++ /home/build/master/cache/broken_results.txt 2007-08-25 00:01:42.0 + @@ -1,24 +1,24 @@ -Build status as of Fri Aug 24 00:00:02 2007 +Build status as of Sat Aug 25 00:00:01 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 32 9 0 +ccache 31 9 0 ctdb 0 0 0 distcc 2 0 0 ldb 30 5 0 -libreplace 30 8 0 -lorikeet-heimdal 27 15 0 -pidl 18 3 0 +libreplace 29 8 0 +lorikeet-heimdal 26 14 0 +pidl 17 3 0 ppp 13 9 0 python 0 0 0 -rsync32 10 0 +rsync31 10 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 28 26 0 -samba_3_233 19 0 -smb-build29 29 0 -talloc 32 1 0 -tdb 31 4 0 +samba4 27 19 0 +samba_3_232 19 0 +smb-build28 28 0 +talloc 31 1 0 +tdb 30 4 0
