Re: [Samba] Re: Samba 3.0.23c won't let NT4 access shares
larry wrote: The practical solution is to replace this box with a more modern one. But I would still like to find out why it doesn't work. See the complete thread http://marc.theaimsgroup.com/?l=sambam=116533540200375w=2 and the patch in http://marc.theaimsgroup.com/?l=sambam=116548167822494w=2 Maybe it's the same problem. I asked Jerry Carter to put important patches for the last stable version 3.0.23d to http://us1.samba.org/samba/patches/ but received no answer :( -- der tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba PDC with Ldap, problems after restart
Hi i think we need more information do the following steps 1) increase the debug level in smb.con to above 5 2) and also check whether the following command gives you the SID of the domain [EMAIL PROTECTED] rpc info 3)Again rejoin a system to the domain and check in the nmbd.log file what is the exact log outout On 12/14/06, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: Hello, I have installed my Samba as a PDC with LDAP Backend, it worked fine, I was able to join the Domain with a Windows XP Client.But Today when i started the server, i can't join a domain anymore. I also can't add users to ldap anymore with smbldap-tools i always get this failure message: 3444 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 217. 3445 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 218. 3446 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 219. 3447 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 220. 3448 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 221. 3449 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 223. 3450 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 224. 3451 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 225. 3452 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 226. 3453 Use of uninitialized value in substitution (s///) at /usr/share/perl5/smbldap_tools.pm line 140, CONFIGFI LE line 227. Does anyone has an idea of the problem? thx Ernest Aigner -- Ein Herz für Kinder - Ihre Spende hilft! Aktion: www.deutschlandsegelt.de Unser Dankeschön: Ihr Name auf dem Segel der 1. deutschen America's Cup-Yacht! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Samba and NFS quota problem
Hi, Just in case someone has any idea on how to solve this, I've done some further testing. I get the same error below on both a fresh CentOS 4.4 install on x86 (not x64, to rule that out) using built-in RHEL packages; and on the original x64 server when compiling from sources (with sys quotas and disk quotas enabled or disabled). As I say I can see the quota correctly on the Samba server using the unix quota command but on the windows client the samba mapped drive shows entirely the wrong value as free/used. If I make the home directory on a local disk which doesn't use quotas all is fine. Am I missing something really obvious? Kind Regards, Steve -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Steve Goodman (lists) Sent: 15 December 2006 15:42 To: samba@lists.samba.org Subject: [Samba] Samba and NFS quota problem Hello, I am mounting via NFS a number of volumes and re-sharing these as CIFS. We have been using this arrangement successfully for a number of years. We are replacing the CIFSNFS proxy servers (which are also PDC/BDCs to OpenLDAP) and a weird problem seems to occur. The problem is the quota/disk size appears to be wrong. For example, if I use the unix quota command on the SMB server, it shows correctly the quota and usage. However on the windows machine this is showing incorrectly. The NFS is mounted with no special options, and I have tried against different NFS servers, different Samba versions and can replicate the problem on both the PDC and BDC servers (which are setup identically) OS: CentOS 4.4 x64 Hardware: Dell Poweredge 2950 Current Samba version: samba3-client-3.0.23d-30 samba3-3.0.23d-30 (Also occurs on CentOS/RHEL Samba-3.0.10) NFS server: Solaris 9, default settings. Also it shows the wrong quota information using another NFS server (EMC Celerra NAS 5.5) Quota shows correctly using quota command: Filesystem blocks quota limit grace files quota limit grace helios:/adm/d501 359519 50 500500 668 0 0 Disk usage on the windows system shows: 8.98MB free of 265MB - writing any file to this fails. Samba also appears to be compiled with quota options enabled: # smbd -b| grep QUOTA HAVE_SYS_QUOTA_H HAVE_LINUX_XFS_QUOTAS HAVE_QUOTACTL_LINUX HAVE_SYS_QUOTAS HAVE_XFS_QUOTAS WITH_QUOTAS WITH_QUOTAS Any thoughts on this problem would be greatly appreciated. I am about to compile from source to see if this still occurs. Steve Goodman -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Disconnected network drive
Found this nice info: Net Config Server /autodisconnect:-1 Credits: http://lists.samba.org/archive/samba/1999-July/013511.html HTH Oliver Paul Abrahams wrote: I have a couple of Linux directories that are being exported via Samba running under SuSE 10.0. On the Windows side, each of them is assigned a (mapped) drive letter. In the My Computer list they initially show up as Disconnected Network Drive. If I attempt to access a file within one of them, the access fails with an indication that the drive does not exist. (For example, if the drive letter is H:, doing H: from a C prompt gives that message.) However, if in Windows I click on the drive, I get to see its contents and the status changes to Network Drive. At that point the drive contents become available to my Windows applications. I get this behavior on three different machines, all running Windows XP. In the Windows drive mapping, I've checked the Reconnect at Logon box, but that makes no difference. I'm guessing that the problem is on the Linux side since each Windows machine can access exported directories from other Windows machines without any difficulty. It's only the drives exported from Linux that have the problem. I can of course work around the problem by opening up My Computer when I start the Windows machine and clicking on the drive in question, but that should not be necessary. Is this a known problem? Is there a workaround or a fix? Paul -- Oliver Schulze L. | Get my e-mail after a captcha in: Asuncion - Paraguay | http://tinymailto.com/oliver -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Disconnected network drive
Thanks for the tip about the registry, I found this interesting articles: http://support.microsoft.com/kb/138365/en-us http://support.microsoft.com/kb/297684/EN-US/ From here: http://lists.samba.org/archive/samba/1999-July/013511.html HTH Oliver Adam Williams wrote: If I recall correctly there is some registry tweak which relates to this. -- Oliver Schulze L. | Get my e-mail after a captcha in: Asuncion - Paraguay | http://tinymailto.com/oliver -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r20209 - in branches/SAMBA_3_0/source/registry: .
Author: vlendec
Date: 2006-12-16 09:33:17 + (Sat, 16 Dec 2006)
New Revision: 20209
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20209
Log:
Fix two memleaks
Modified:
branches/SAMBA_3_0/source/registry/reg_eventlog.c
Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_eventlog.c
===
--- branches/SAMBA_3_0/source/registry/reg_eventlog.c 2006-12-16 05:02:21 UTC
(rev 20208)
+++ branches/SAMBA_3_0/source/registry/reg_eventlog.c 2006-12-16 09:33:17 UTC
(rev 20209)
@@ -48,8 +48,10 @@
}
regdb_fetch_keys( KEY_EVENTLOG, subkeys );
regsubkey_ctr_addkey( subkeys, *elogs );
- if ( !regdb_store_keys( KEY_EVENTLOG, subkeys ) )
+ if ( !regdb_store_keys( KEY_EVENTLOG, subkeys ) ) {
+ TALLOC_FREE(subkeys);
return False;
+ }
TALLOC_FREE( subkeys );
/* add in the key of form KEY_EVENTLOG/Application */
@@ -70,8 +72,10 @@
regdb_fetch_keys( evtlogpath, subkeys );
regsubkey_ctr_addkey( subkeys, *elogs );
- if ( !regdb_store_keys( evtlogpath, subkeys ) )
+ if ( !regdb_store_keys( evtlogpath, subkeys ) ) {
+ TALLOC_FREE(subkeys);
return False;
+ }
TALLOC_FREE( subkeys );
/* now add the values to the KEY_EVENTLOG/Application form key
*/
@@ -287,8 +291,7 @@
sourcename ) );
}
TALLOC_FREE( values );
- if ( wrklist )
- TALLOC_FREE( wrklist ); /* */
+ TALLOC_FREE( wrklist ); /* */
if ( !( subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR ) ) ) {
DEBUG( 0, ( talloc() failure!\n ) );
svn commit: samba r20211 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2006-12-16 10:36:25 + (Sat, 16 Dec 2006)
New Revision: 20211
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20211
Log:
send_nt_replies does not need the inbuf arg
Modified:
branches/SAMBA_3_0/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2006-12-16 09:36:10 UTC (rev
20210)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2006-12-16 10:36:25 UTC (rev
20211)
@@ -68,8 +68,9 @@
HACK ! Always assumes smb_setup field is zero.
/
-static int send_nt_replies(char *inbuf, char *outbuf, int bufsize, NTSTATUS
nt_error, char *params,
- int paramsize, char *pdata, int datasize)
+static int send_nt_replies(char *outbuf, int bufsize, NTSTATUS nt_error,
+ char *params, int paramsize, char *pdata,
+ int datasize)
{
int data_to_send = datasize;
int params_to_send = paramsize;
@@ -477,9 +478,10 @@
START_PROFILE(SMBntcreateX);
- DEBUG(10,(reply_ntcreate_and_X: flags = 0x%x, access_mask = 0x%x \
-file_attributes = 0x%x, share_access = 0x%x, create_disposition = 0x%x \
-create_options = 0x%x root_dir_fid = 0x%x\n,
+ DEBUG(10,(reply_ntcreate_and_X: flags = 0x%x, access_mask = 0x%x
+ file_attributes = 0x%x, share_access = 0x%x,
+ create_disposition = 0x%x create_options = 0x%x
+ root_dir_fid = 0x%x\n,
(unsigned int)flags,
(unsigned int)access_mask,
(unsigned int)file_attributes,
@@ -959,7 +961,7 @@
DEBUG(5,(do_nt_transact_create_pipe: open name = %s\n, fname));
/* Send the required number of replies */
- send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, params, 69,
*ppdata, 0);
+ send_nt_replies(outbuf, bufsize, NT_STATUS_OK, params, 69, *ppdata, 0);
return -1;
}
@@ -1531,7 +1533,7 @@
DEBUG(5,(call_nt_transact_create: open name = %s\n, fname));
/* Send the required number of replies */
- send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, params, 69,
*ppdata, 0);
+ send_nt_replies(outbuf, bufsize, NT_STATUS_OK, params, 69, *ppdata, 0);
return -1;
}
@@ -1805,10 +1807,15 @@
don't allow a directory to be opened.
/
-static int call_nt_transact_notify_change(connection_struct *conn, char
*inbuf, char *outbuf, int length, int bufsize,
- uint16 **ppsetup, uint32 setup_count,
- char **ppparams, uint32 parameter_count,
- char **ppdata, uint32 data_count, uint32
max_data_count)
+static int call_nt_transact_notify_change(connection_struct *conn, char *inbuf,
+ char *outbuf, int length,
+ int bufsize,
+ uint16 **ppsetup, uint32 setup_count,
+ char **ppparams,
+ uint32 parameter_count,
+ char **ppdata, uint32 data_count,
+ uint32 max_data_count,
+ uint32 max_param_count)
{
uint16 *setup = *ppsetup;
files_struct *fsp;
@@ -1827,6 +1834,9 @@
return ERROR_DOS(ERRDOS,ERRbadfid);
}
+ DEBUG(3,(call_nt_transact_notify_change: notify change called on
+directory name = %s\n, fsp-fsp_name ));
+
if((!fsp-is_directory) || (conn != fsp-conn)) {
return ERROR_DOS(ERRDOS,ERRbadfid);
}
@@ -1835,9 +1845,6 @@
return(UNIXERROR(ERRDOS,ERRbadfid));
}
- DEBUG(3,(call_nt_transact_notify_change: notify change called on
directory \
-name = %s\n, fsp-fsp_name ));
-
return -1;
}
@@ -1877,7 +1884,7 @@
/*
* Rename was successful.
*/
- send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
+ send_nt_replies(outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
DEBUG(3,(nt transact rename from = %s, to = %s succeeded.\n,
fsp-fsp_name, new_name));
@@ -1972,8 +1979,8 @@
if(max_data_count sd_size) {
- send_nt_replies(inbuf, outbuf, bufsize,
NT_STATUS_BUFFER_TOO_SMALL,
- params, 4, *ppdata, 0);
+ send_nt_replies(outbuf, bufsize, NT_STATUS_BUFFER_TOO_SMALL,
+ params, 4, *ppdata, 0);
talloc_destroy(mem_ctx);
svn commit: samba r20212 - in branches/SAMBA_3_0/source/passdb: .
Author: vlendec
Date: 2006-12-16 11:15:03 + (Sat, 16 Dec 2006)
New Revision: 20212
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20212
Log:
Attempt to fix the Solaris build
Modified:
branches/SAMBA_3_0/source/passdb/lookup_sid.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/lookup_sid.c
===
--- branches/SAMBA_3_0/source/passdb/lookup_sid.c 2006-12-16 10:36:25 UTC
(rev 20211)
+++ branches/SAMBA_3_0/source/passdb/lookup_sid.c 2006-12-16 11:15:03 UTC
(rev 20212)
@@ -1306,7 +1306,8 @@
if (!winbind_uid_to_sid(psid, uid)) {
if (!winbind_ping()) {
DEBUG(2, (WARNING: Winbindd not running, mapping ids
with legacy code\n));
- return legacy_uid_to_sid(psid, uid);
+ legacy_uid_to_sid(psid, uid);
+ return;
}
DEBUG(5, (uid_to_sid: winbind failed to find a sid for uid
%u\n,
@@ -1335,7 +1336,8 @@
if (!winbind_gid_to_sid(psid, gid)) {
if (!winbind_ping()) {
DEBUG(2, (WARNING: Winbindd not running, mapping ids
with legacy code\n));
- return legacy_gid_to_sid(psid, gid);
+ legacy_gid_to_sid(psid, gid);
+ return;
}
DEBUG(5, (gid_to_sid: winbind failed to find a sid for gid
%u\n,
svn commit: samba r20214 - in branches/SAMBA_3_0/source/param: .
Author: vlendec Date: 2006-12-16 17:47:22 + (Sat, 16 Dec 2006) New Revision: 20214 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20214 Log: Fix a type-punned warning. Simo, Jerry, please check Modified: branches/SAMBA_3_0/source/param/loadparm.c Changeset: Modified: branches/SAMBA_3_0/source/param/loadparm.c === --- branches/SAMBA_3_0/source/param/loadparm.c 2006-12-16 17:21:53 UTC (rev 20213) +++ branches/SAMBA_3_0/source/param/loadparm.c 2006-12-16 17:47:22 UTC (rev 20214) @@ -182,7 +182,7 @@ BOOL bWinbindOfflineLogon; char **szIdmapDomains; char **szIdmapBackend; /* deprecated */ - char **szIdmapAllocBackend; + char *szIdmapAllocBackend; char *szAddShareCommand; char *szChangeShareCommand; char *szDeleteShareCommand;
svn commit: samba r20215 - in branches/SAMBA_3_0/source: include lib
Author: vlendec
Date: 2006-12-16 17:54:16 + (Sat, 16 Dec 2006)
New Revision: 20215
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20215
Log:
Next step trying to fix the Solaris build.
I think anonimous is correctly spelled anonymous. The Solaris compile is
referring to this as anonymous in line 814 of smbldap.c. Simo, please check.
Thanks,
Volker
Modified:
branches/SAMBA_3_0/source/include/smbldap.h
branches/SAMBA_3_0/source/lib/smbldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/smbldap.h
===
--- branches/SAMBA_3_0/source/include/smbldap.h 2006-12-16 17:47:22 UTC (rev
20214)
+++ branches/SAMBA_3_0/source/include/smbldap.h 2006-12-16 17:54:16 UTC (rev
20215)
@@ -160,7 +160,7 @@
const char *uri;
/* credentials */
- BOOL anonimous;
+ BOOL anonymous;
char *bind_dn;
char *bind_secret;
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===
--- branches/SAMBA_3_0/source/lib/smbldap.c 2006-12-16 17:47:22 UTC (rev
20214)
+++ branches/SAMBA_3_0/source/lib/smbldap.c 2006-12-16 17:54:16 UTC (rev
20215)
@@ -934,7 +934,7 @@
int rc;
int version;
- if (!ldap_state-anonimous !ldap_state-bind_dn) {
+ if (!ldap_state-anonymous !ldap_state-bind_dn) {
/* get the default dn and password only if they are not set
already */
if (!fetch_ldap_pw(ldap_state-bind_dn,
ldap_state-bind_secret)) {
@@ -1708,7 +1708,7 @@
BOOL smbldap_set_creds(struct smbldap_state *ldap_state, BOOL anon, const char
*dn, const char *secret)
{
- ldap_state-anonimous = anon;
+ ldap_state-anonymous = anon;
/* free any previously set credential */
svn commit: samba r20216 - in branches/SAMBA_3_0/source/nsswitch: .
Author: idra
Date: 2006-12-16 18:13:12 + (Sat, 16 Dec 2006)
New Revision: 20216
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20216
Log:
Fix fallback code.
A reversed check made it impossile to fallback to the Unix Domain mapping code.
Also fix a potential use of a freed array.
Jerry,
my tests shows that this code now correctly handle the fallback to Unix Domain
when our Domain member is asked for a mapped group that has a unix name
different
from the Windows name against a Samba DC and we do not use winbindd but share
users/groups by other means (ldap / sync of passwd and group files)
Immediate Fix would be to discuss if we should answer back when
DOMAIN\unixgroup - SID
is asked for, in the case the unixgroup name is mapped to a different name.
IE: DOMAIN\Domain Admins - ntadmins
Currently if we are asked for DOMAIN\Domain Admins we return the dom admins
SID
If we are asked for DOMAIN\ntadmins we return not found, but we may consider
to
return the Domain admins SID in this case too.
Comments are welcome on this point!
Long term fix I think is the unixinfo pipe and of course an idmap_unixinfo
moudle.
Simo.
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap.c 2006-12-16 17:54:16 UTC (rev
20215)
+++ branches/SAMBA_3_0/source/nsswitch/idmap.c 2006-12-16 18:13:12 UTC (rev
20216)
@@ -791,6 +791,7 @@
static NTSTATUS idmap_backends_unixids_to_sids(struct id_map **ids)
{
struct idmap_domain *dom;
+ struct id_map **unmapped;
struct id_map **_ids;
TALLOC_CTX *ctx;
NTSTATUS ret;
@@ -819,8 +820,8 @@
_ids[i]-mapped = False;
}
+ unmapped = NULL;
for (n = num_domains-1; n = 0; n--) { /* cycle backwards */
- struct id_map **unmapped = NULL;
dom = idmap_domains[n];
@@ -829,7 +830,7 @@
ret = dom-methods-unixids_to_sids(dom, _ids);
IDMAP_CHECK_RET(ret);
- TALLOC_FREE(unmapped);
+ unmapped = NULL;
for (i = 0, u = 0; _ids[i]; i++) {
if (_ids[i]-mapped == False) {
@@ -842,27 +843,28 @@
if (unmapped) {
/* terminate the unmapped list */
unmapped[u] = NULL;
- } else { /* no more unmapped entries, get out */
+ } else { /* no more entries, get out */
break;
}
_ids = unmapped;
+
}
- if (!_ids) {
+ if (unmapped) {
/* there are still unmapped ids, map them to the unix
users/groups domains */
- for (i = 0; _ids[i]; i++) {
- switch (_ids[i]-xid.type) {
+ for (i = 0; unmapped[i]; i++) {
+ switch (unmapped[i]-xid.type) {
case ID_TYPE_UID:
- uid_to_unix_users_sid((uid_t)_ids[i]-xid.id,
_ids[i]-sid);
- _ids[i]-mapped = True;
+
uid_to_unix_users_sid((uid_t)unmapped[i]-xid.id, unmapped[i]-sid);
+ unmapped[i]-mapped = True;
break;
case ID_TYPE_GID:
- gid_to_unix_groups_sid((gid_t)_ids[i]-xid.id,
_ids[i]-sid);
- _ids[i]-mapped = True;
+
gid_to_unix_groups_sid((gid_t)unmapped[i]-xid.id, unmapped[i]-sid);
+ unmapped[i]-mapped = True;
break;
default: /* what?! */
- _ids[i]-mapped = False;
+ unmapped[i]-mapped = False;
break;
}
}
svn commit: samba r20217 - in branches/SAMBA_3_0/source/nsswitch: .
Author: vlendec
Date: 2006-12-16 18:37:33 + (Sat, 16 Dec 2006)
New Revision: 20217
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20217
Log:
uid_t and gid_t are not necessarily 32 bit. In assignments we get an automatic
conversion, but not when we pass pointers down to other functions.
Simo, please check.
Volker
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c 2006-12-16 18:13:12 UTC
(rev 20216)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c 2006-12-16 18:37:33 UTC
(rev 20217)
@@ -145,8 +145,10 @@
const char *secret;
const char *range;
const char *tmp;
- uint32_t low_id = 0;
- uint32_t high_id = 0;
+ uid_t low_uid = 0;
+ uid_t high_uid = 0;
+ gid_t low_gid = 0;
+ gid_t high_gid = 0;
idmap_alloc_ldap = talloc_zero(NULL, struct idmap_ldap_alloc_context);
if (!idmap_alloc_ldap) {
@@ -162,6 +164,8 @@
range = lp_parm_const_string(-1, idmap alloc config, range, NULL);
if (range range[0]) {
+ unsigned low_id, high_id;
+
if (sscanf(range, %u - %u, low_id, high_id) == 2) {
if (low_id high_id) {
idmap_alloc_ldap-low_gid =
idmap_alloc_ldap-low_uid = low_id;
@@ -174,14 +178,14 @@
}
}
- if (lp_idmap_uid(low_id, high_id)) {
- idmap_alloc_ldap-low_uid = low_id;
- idmap_alloc_ldap-high_uid = high_id;
+ if (lp_idmap_uid(low_uid, high_uid)) {
+ idmap_alloc_ldap-low_uid = low_uid;
+ idmap_alloc_ldap-high_uid = high_uid;
}
- if (lp_idmap_gid(low_id, high_id)) {
- idmap_alloc_ldap-low_gid = low_id;
- idmap_alloc_ldap-high_gid= high_id;
+ if (lp_idmap_gid(low_gid, high_gid)) {
+ idmap_alloc_ldap-low_gid = low_gid;
+ idmap_alloc_ldap-high_gid= high_gid;
}
if (idmap_alloc_ldap-high_uid = idmap_alloc_ldap-low_uid) {
svn commit: samba r20218 - in branches/SAMBA_3_0/source/nsswitch: .
Author: vlendec
Date: 2006-12-16 18:41:22 + (Sat, 16 Dec 2006)
New Revision: 20218
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20218
Log:
Same fix as r20217 -- can we consolidate that duplicated code a bit?
Modified:
branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c
===
--- branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c 2006-12-16 18:37:33 UTC
(rev 20217)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c 2006-12-16 18:41:22 UTC
(rev 20218)
@@ -340,8 +340,10 @@
NTSTATUS ret;
TALLOC_CTX *ctx;
const char *range;
- uint32_t low_id = 0;
- uint32_t high_id = 0;
+ uid_t low_uid = 0;
+ uid_t high_uid = 0;
+ gid_t low_gid = 0;
+ gid_t high_gid = 0;
/* use our own context here */
ctx = talloc_new(NULL);
@@ -366,6 +368,8 @@
range = lp_parm_const_string(-1, idmap alloc config, range, NULL);
if (range range[0]) {
+ unsigned low_id, high_id;
+
if (sscanf(range, %u - %u, low_id, high_id) == 2) {
if (low_id high_id) {
idmap_tdb_state.low_gid =
idmap_tdb_state.low_uid = low_id;
@@ -379,14 +383,14 @@
}
/* Create high water marks for group and user id */
- if (lp_idmap_uid(low_id, high_id)) {
- idmap_tdb_state.low_uid = low_id;
- idmap_tdb_state.high_uid = high_id;
+ if (lp_idmap_uid(low_uid, high_uid)) {
+ idmap_tdb_state.low_uid = low_uid;
+ idmap_tdb_state.high_uid = high_uid;
}
- if (lp_idmap_gid(low_id, high_id)) {
- idmap_tdb_state.low_gid = low_id;
- idmap_tdb_state.high_gid = high_id;
+ if (lp_idmap_gid(low_gid, high_gid)) {
+ idmap_tdb_state.low_gid = low_gid;
+ idmap_tdb_state.high_gid = high_gid;
}
if (idmap_tdb_state.high_uid = idmap_tdb_state.low_uid) {
@@ -394,6 +398,8 @@
DEBUGADD(1, (idmap will be unable to map foreign SIDs\n));
return NT_STATUS_UNSUCCESSFUL;
} else {
+ uint32 low_id;
+
if (((low_id = tdb_fetch_int32(idmap_alloc_tdb, HWM_USER)) ==
-1) ||
(low_id idmap_tdb_state.low_uid)) {
if (tdb_store_int32(idmap_alloc_tdb, HWM_USER,
idmap_tdb_state.low_uid) == -1) {
@@ -408,6 +414,8 @@
DEBUGADD(1, (idmap will be unable to map foreign SIDs\n));
return NT_STATUS_UNSUCCESSFUL;
} else {
+ uint32 low_id;
+
if (((low_id = tdb_fetch_int32(idmap_alloc_tdb, HWM_GROUP)) ==
-1) ||
(low_id idmap_tdb_state.low_gid)) {
if (tdb_store_int32(idmap_alloc_tdb, HWM_GROUP,
idmap_tdb_state.low_gid) == -1) {
Re: svn commit: samba r20217 - in branches/SAMBA_3_0/source/nsswitch: .
On Sat, 2006-12-16 at 18:37 +, [EMAIL PROTECTED] wrote: Author: vlendec Date: 2006-12-16 18:37:33 + (Sat, 16 Dec 2006) New Revision: 20217 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20217 Log: uid_t and gid_t are not necessarily 32 bit. In assignments we get an automatic conversion, but not when we pass pointers down to other functions. Simo, please check. As long as we make sure they are 32bit values when they flow over the winbindd pipe I am ok with this kind of fixes. What platform does 16 bit UIDs still btw? Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org
svn commit: samba r20219 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2006-12-16 19:05:50 + (Sat, 16 Dec 2006)
New Revision: 20219
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20219
Log:
add enough knowledge to display the content of attributeSchema objects
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2006-12-16 18:41:22 UTC
(rev 20218)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl2006-12-16 19:05:50 UTC
(rev 20219)
@@ -312,6 +312,7 @@
* 2.5.6.* = 0x0001 (standard object classes
RFC2256 core.schema)
* 1.2.840.113556.1.2.* = 0x0002
* 1.2.840.113556.1.3.* = 0x0003
+* 2.5.5.* = 0x0008 (attributeSyntax OID's)
* 1.2.840.113556.1.4.* = 0x0009
* 1.2.840.113556.1.5.* = 0x000A
* 2.16.840.1.113730.3.*= 0x0014
@@ -374,33 +375,57 @@
*/
typedef [flag(NDR_PAHEX),v1_enum] enum {
- DRSUAPI_OBJECTCLASS_top = 0x0001
+ DRSUAPI_OBJECTCLASS_top = 0x0001,
+ DRSUAPI_OBJECTCLASS_classSchema = 0x0003000d,
+ DRSUAPI_OBJECTCLASS_attributeSchema = 0x0003000e
} drsuapi_DsObjectClassId;
typedef [flag(NDR_PAHEX),v1_enum,public] enum {
DRSUAPI_ATTRIBUTE_objectClass = 0x,
DRSUAPI_ATTRIBUTE_description = 0x000d,
DRSUAPI_ATTRIBUTE_member= 0x001f,
+ DRSUAPI_ATTRIBUTE_instanceType = 0x00020001,
+ DRSUAPI_ATTRIBUTE_whenCreated = 0x00020002,
DRSUAPI_ATTRIBUTE_hasMasterNCs = 0x0002000e,
+ DRSUAPI_ATTRIBUTE_governsID = 0x00020016,
+ DRSUAPI_ATTRIBUTE_attributeID = 0x0002001e,
+ DRSUAPI_ATTRIBUTE_attributeSyntax = 0x00020020,
+ DRSUAPI_ATTRIBUTE_isSingleValued= 0x00020021,
+ DRSUAPI_ATTRIBUTE_rangeLower= 0x00020022,
+ DRSUAPI_ATTRIBUTE_rangeUpper= 0x00020023,
+ DRSUAPI_ATTRIBUTE_dMDLocation = 0x00020024,
+ DRSUAPI_ATTRIBUTE_objectVersion = 0x0002004c,
DRSUAPI_ATTRIBUTE_invocationId = 0x00020073,
- DRSUAPI_ATTRIBUTE_dMDLocation = 0x00020024,
+ DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly= 0x000200a9,
+ DRSUAPI_ATTRIBUTE_adminDisplayName = 0x000200c2,
+ DRSUAPI_ATTRIBUTE_adminDescription = 0x000200e2,
+ DRSUAPI_ATTRIBUTE_oMSyntax = 0x000200e7,
DRSUAPI_ATTRIBUTE_ntSecurityDescriptor = 0x00020119,
+ DRSUAPI_ATTRIBUTE_searchFlags = 0x0002014e,
+ DRSUAPI_ATTRIBUTE_lDAPDisplayName = 0x000201cc,
+ DRSUAPI_ATTRIBUTE_name = 0x00090001,
DRSUAPI_ATTRIBUTE_currentValue = 0x0009001b,
DRSUAPI_ATTRIBUTE_objectSid = 0x00090092,
+ DRSUAPI_ATTRIBUTE_schemaIDGUID = 0x00090094,
DRSUAPI_ATTRIBUTE_dBCSPwd = 0x00090037,/*
lmPwdHash */
DRSUAPI_ATTRIBUTE_unicodePwd= 0x0009005a,/*
ntPwdHash */
DRSUAPI_ATTRIBUTE_ntPwdHistory = 0x0009005e,
DRSUAPI_ATTRIBUTE_priorValue= 0x00090064,
- DRSUAPI_ATTRIBUTE_lmPwdHistory = 0x000900a0,
DRSUAPI_ATTRIBUTE_supplementalCredentials = 0x0009007d,
DRSUAPI_ATTRIBUTE_trustAuthIncoming = 0x00090081,
DRSUAPI_ATTRIBUTE_trustAuthOutgoing = 0x00090087,
+ DRSUAPI_ATTRIBUTE_lmPwdHistory = 0x000900a0,
+ DRSUAPI_ATTRIBUTE_sAMAccountName= 0x000900dd,
+ DRSUAPI_ATTRIBUTE_fSMORoleOwner = 0x00090171,
DRSUAPI_ATTRIBUTE_systemFlags = 0x00090177,
DRSUAPI_ATTRIBUTE_serverReference = 0x00090203,
DRSUAPI_ATTRIBUTE_serverReferenceBL = 0x00090204,
DRSUAPI_ATTRIBUTE_initialAuthIncoming = 0x0009021b,
DRSUAPI_ATTRIBUTE_initialAuthOutgoing = 0x0009021c,
+ DRSUAPI_ATTRIBUTE_wellKnownObjects
svn commit: samba r20220 - in branches/SAMBA_4_0: services/samba swat swat/apps swat/apps/plug-ins swat/apps/samba/utils
Author: derrell
Date: 2006-12-16 19:07:37 + (Sat, 16 Dec 2006)
New Revision: 20220
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20220
Log:
Apply patch from Brad Henry with some additional qooxdoo/json-rpc SWAT
functionality: basic admin console.
Added:
branches/SAMBA_4_0/services/samba/adm.esp
branches/SAMBA_4_0/swat/apps/plug-ins/
branches/SAMBA_4_0/swat/apps/plug-ins/echo.js
branches/SAMBA_4_0/swat/apps/plug-ins/nbt_stats.js
branches/SAMBA_4_0/swat/apps/samba/utils/admin_console.html
Modified:
branches/SAMBA_4_0/swat/menu.js
Changeset:
Added: branches/SAMBA_4_0/services/samba/adm.esp
===
--- branches/SAMBA_4_0/services/samba/adm.esp 2006-12-16 19:05:50 UTC (rev
20219)
+++ branches/SAMBA_4_0/services/samba/adm.esp 2006-12-16 19:07:37 UTC (rev
20220)
@@ -0,0 +1,22 @@
+%
+
+jsonrpc_include(resources.esp);
+
+libinclude(base.js);
+libinclude(management.js);
+
+function _echo(params, error) {
+ var echo_string = params[0];
+ return echo_string;
+}
+jsonrpc.method.echo = _echo;
+
+function _nbt_packet_stats(params, error) {
+ var stats = nbtd_statistics();
+ stats.server_status = new Object();
+ stats.server_status = server_status(nbt);
+ return stats;
+}
+jsonrpc.method.NBTPacketStats = _nbt_packet_stats;
+
+%
Added: branches/SAMBA_4_0/swat/apps/plug-ins/echo.js
===
--- branches/SAMBA_4_0/swat/apps/plug-ins/echo.js 2006-12-16 19:05:50 UTC
(rev 20219)
+++ branches/SAMBA_4_0/swat/apps/plug-ins/echo.js 2006-12-16 19:07:37 UTC
(rev 20220)
@@ -0,0 +1,71 @@
+
+// This function takes the main pane widget and jams its widget in the right
+// sub-pane.
+
+function _asyncEchoHandler(result, ex, id, paneWidget) {
+ var replyTextArea = null;
+ var refreshButton = null;
+ var echoTextField = null;
+
+ if (ex == null) {
+ // We need to remove anything previously drawn in this area.
+ paneWidget.removeAll();
+
+ echoTextField = new qx.ui.form.TextField();
+ echoTextField.setTop(0);
+ echoTextField.setLeft(0);
+
+ refreshButton = new qx.ui.form.Button(Refresh);
+ refreshButton.setTop(0);
+ refreshButton.setLeft(150);
+
+ replyTextArea = new
+ qx.ui.form.TextArea(result);
+ replyTextArea.setWrap(true);
+ replyTextArea.setWidth(100%);
+ replyTextArea.setHeight(50%);
+ replyTextArea.setTop(30);
+ replyTextArea.setBottom(50);
+ replyTextArea.setLeft(0);
+ replyTextArea.setRight(20);
+ } else {
+ alert(Async( + id + ) exception: + ex);
+ }
+ paneWidget.add(replyTextArea);
+ paneWidget.add(refreshButton);
+ paneWidget.add(echoTextField);
+
+ // Provide a handler for the button.
+ with (refreshButton) {
+ addEventListener(execute, function(e) {
+ this.debug(executed: + this.getLabel());
+ this.debug(echoTextField.getValue(): +
echoTextField.getValue());
+ _echoPlugInDisplay(paneWidget,
echoTextField.getValue());
+ });
+ };
+}
+
+function _echoPlugInDisplay(paneWidget, echoText) {
+ if (echoText == null) {
+ echoText = Hello World!;
+ }
+
+var rpc = new qx.io.remote.Rpc();
+rpc.setTimeout(6);
+rpc.setUrl(/services/);
+rpc.setServiceName(samba.adm);
+rpc.setCrossDomain(false);
+
+mycall = rpc.callAsync(
+function(result, ex, id) {
+ _asyncEchoHandler(result, ex, id, paneWidget);
+},
+echo,
+ echoText);
+}
+
+function EchoPlugIn() {
+ var o = new Object();
+ o.display = _echoPlugInDisplay;
+ return o;
+}
Added: branches/SAMBA_4_0/swat/apps/plug-ins/nbt_stats.js
===
--- branches/SAMBA_4_0/swat/apps/plug-ins/nbt_stats.js 2006-12-16 19:05:50 UTC
(rev 20219)
+++ branches/SAMBA_4_0/swat/apps/plug-ins/nbt_stats.js 2006-12-16 19:07:37 UTC
(rev 20220)
@@ -0,0 +1,62 @@
+
+// This function takes the main pane widget and jams its widget in the right
+// sub-pane.
+
+function _asyncNBTStatsHandler(result, ex, id, paneWidget) {
+ var statusTextArea = null;
+
+ var listData = [];
+ listData.push({
+ server_status : { text : result.server_status },
+ total_received : { text : result.total_received.toString() },
+ total_sent : { text : result.total_sent.toString() },
+ query_count : { text : result.query_count.toString() },
+ release_count : { text :
Build status as of Sun Dec 17 00:00:02 2006
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2006-12-16 00:00:05.0 + +++ /home/build/master/cache/broken_results.txt 2006-12-17 00:00:52.0 + @@ -1,22 +1,22 @@ -Build status as of Sat Dec 16 00:00:01 2006 +Build status as of Sun Dec 17 00:00:02 2006 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 40 7 0 +ccache 41 7 0 ctdb 0 0 0 distcc 2 0 0 -ldb 40 5 0 +ldb 40 4 0 libreplace 38 2 0 lorikeet-heimdal 33 17 0 ppp 18 0 0 -rsync40 3 0 +rsync41 3 0 samba0 0 0 samba-docs 0 0 0 samba4 39 26 0 -samba_3_041 17 0 +samba_3_041 14 0 smb-build38 1 0 -talloc 41 1 0 +talloc 40 1 0 tdb 40 2 0
svn commit: samba r20221 - in branches/SAMBA_4_0/source: dsdb dsdb/samdb dsdb/schema torture/ldap
Author: metze Date: 2006-12-17 02:19:56 + (Sun, 17 Dec 2006) New Revision: 20221 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20221 Log: - move the dsdb_schema, dsdb_attribute, dsdb_class structs into a generic location - this struct should be also used by the dsdb/samdb/ldb_modules/schema.c module later - add functions to map from LDAP OID values to uint32_t values - add torture test for the OID = uint32 mapping code metze Added: branches/SAMBA_4_0/source/dsdb/schema/ branches/SAMBA_4_0/source/dsdb/schema/schema.h branches/SAMBA_4_0/source/dsdb/schema/schema_init.c Modified: branches/SAMBA_4_0/source/dsdb/config.mk branches/SAMBA_4_0/source/dsdb/samdb/samdb.h branches/SAMBA_4_0/source/torture/ldap/schema.c Changeset: Sorry, the patch is too large (781 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20221
