Re: [Samba] Migrating NT4 Domain with Idealx tools

2004-11-13 Thread Paul Coray
Marcel de Riedmatten wrote:
Le mar 09/11/2004 à 17:57, Paul Coray a écrit :
Hi all
For several days I've been doing tests for our upcoming migration from 
an NT domain to Samba PDC with ldapsam. We have ~200 clients, mostly NT4 
and some Win2k. We want all of our users eventually switch from Windows 
to KDE on Linux with thin clients through NX :-)

I managed to net rpc vampire all user and machine accounts into LDAP, 
but then I realized some problems:

- The migrated machine accounts have no samba attributes. I can 
reproduce this behavior adding a machine account doing smbldap-useradd 
-w [machinename], just as in the 'add machine script' line in smb.conf 
suggested by Idealx. The machine account  machinename$ will exist then, 
but without sambaSAMAccount object class nor any other samba attribute. 
Only after adding these by hand and joning the machine to my samba 
domain, users can login. I tried also using smbldap-useradd with 
multiple options, -w for workstation account and -a for samba 
attributes, but no luck. I wish I shouldn't add 200 machines to an 
already existing domain after the migration...

This doesn't seem normal.  The samba attribute should be added by the
vampire.
But I my case it doesn't... net rpc vampire says 'Couldn't create Posix 
information for machinename$'. Well in reality, it did, but without 
samba atrrs.

Now I realize this works when i configure LDAP and Idealx-Tools to store 
machine accounts in the same container as useraccounts. Although this 
makes my directory look somewhat messy, I can live with it if I have to. 
Still I can't add machines doing smbldap-useradd -w, nor when I try to 
join the domain from a client.

 So I would suspect some problem in the communication with the
PDC and double check that on the samba box 

1) you have the domain SID as local SID
Do SIDS for the PDC and for the domain have to be the same?
2) you have joined the domain as BDC
3) you can see the attribute with net samdump 


- Users, once logged in to Linux, cannot change their password with 
smbldap-passwd. They get 'user [username] doesn't exist.' Well, I'm 
talking about a logged in user...

At distance this is a hard guess. I suggest that you look at the ldap
log to get an idea what happend. 

Rgds
Paul
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Transfer winbind idmap to LDAP

2004-11-13 Thread Paul Coray
Marcel de Riedmatten wrote:
Le mer 10/11/2004 à 11:21, Paul Coray a écrit :
Hi all
This seems simple, but I can't figure how tho acheive it.
I have:
- NT4-PDC
- Fileserver (Solaris 9), Samba 3.0.2 member server with winbind
I want to migrate my NT4-PDC to Samba PDC with ldapsam. How can I make 
sure that after vamprie my old PDC to Samba-PDC, the user and group ids 
will be the same as in the winbind-idmap of my Samba member server?


Hi Paul 

this is my suggestion:
1) get the winbind-idmap in text form with a getent passwd for example
I did that with # net idmap dump winbindd_idmap.tdb  
/tmp/winbindd_idmap.dump on the member server. the resulting file looks 
like:

...
UID 10013 S-1-5-21-98201057-1281969052-1085559986-1608
UID 10202 S-1-5-21-98201057-1281969052-1085559986-1436
UID 10138 S-1-5-21-98201057-1281969052-1085559986-1011
UID 10105 S-1-5-21-98201057-1281969052-1085559986-1418
UID 10067 S-1-5-21-98201057-1281969052-1085559986-1137
...
2) remove the nss_winbind from the nssswitch.conf or what it is on
solaris; this is because the vampire will look in the unix database to
see if the account exist and if the account already exist it w'ont be
added.
No need for that, as on my new PDC-LDAP system no winbind nss is 
configured in the first place.
3) hack the script defined under user add script who will be adding
the users to use the information of 1). With the ldap backend this is
usually smbldap-useradd .
Well, I'd like to, but my knowledge of Perl is still too limited :-( So 
if any body can help, I think I'm not the only one who would appreciate 
highly! Another way would be to modify the IDs of each user and Group in 
LDAP after the vampire process.

4) do the usual procedure 

Anyone has a better idea !
Cheers

--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] Rejoin Domain

2004-11-13 Thread Norman Zhang
I've samba 3.0.2 joined to a NT 4.0 domain as a domain member server.
# net rpc join -U -UAdministrator%password
Windows clients access it using winbind. If I upgrade all NT 4.0 servers 
to W2K3 AD,

# net ads join -U Administrator%password
do I need to rejoin the samba servers to AD? Will winbind continue to 
work? I think W2K3 by default uses kerberos. Will all uid.gid mapping be 
lost?

Regards,
Norman Zhang
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] 3.0.8 compile warnings and link error

2004-11-13 Thread Thomas Bork
Gerald (Jerry) Carter schrieb:
| + ac_cv_gnu_ld_version=GNU ld version 2.12
What platform is this (uname -a or linux distro ver.)?
here is an patch from Maximilian Pasternak:
Submitted By: Maximilian Pasternak [EMAIL PROTECTED]
Date: 2004-11-13
Initial Package Version: 3.0.8
Description: Fixes detection of ld version. Now works with release versions.
diff -uNr samba-3.0.8/source/configure.orig samba-3.0.8/source/configure
--- samba-3.0.8/source/configure.orig   Mon Nov 08 05:09:04 2004
+++ samba-3.0.8/source/configureSat Nov 13 11:58:09 2004
@@ -3174,15 +3174,28 @@
 if test $ac_cv_prog_gnu_ld = yes; then
-	ac_cv_gnu_ld_version=`$LD -v 2/dev/null | head -1`
-	echo $as_me:$LINENO: checking GNU ld release date 5
-echo $ECHO_N checking GNU ld release date... $ECHO_C 6
-		ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
-		echo $as_me:$LINENO: result: ${ac_cv_gnu_ld_date} 5
-echo ${ECHO_T}${ac_cv_gnu_ld_date} 6
- 	if test $ac_cv_gnu_ld_date -lt 20030217; then
- 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
- 	fi
+  ac_cv_gnu_ld_version=`$LD -v 2/dev/null | head -1`
+  if `echo $ac_cv_gnu_ld_version | grep -q -E 
^.*[2-9][0-9][0-9][0-9][-]*[01][0-9][-]*[0-3][0-9].*$`; then
+echo $as_me:$LINENO: checking GNU ld release date 5
+echo $ECHO_N checking GNU ld release date... $ECHO_C 6
+ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+echo $as_me:$LINENO: result: ${ac_cv_gnu_ld_date} 5
+echo ${ECHO_T}${ac_cv_gnu_ld_date} 6
+if test $ac_cv_gnu_ld_date -lt 20030217; then
+  ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+fi
+  else
+echo $as_me:$LINENO: checking GNU ld release version 5
+echo $ECHO_N checking GNU ld release version... $ECHO_C 6
+ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^.*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+echo $as_me:$LINENO: result: ${ac_cv_gnu_ld_vernr} 5
+echo ${ECHO_T}${ac_cv_gnu_ld_vernr} 6
+ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
+ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
+if test $ac_cv_gnu_ld_vernr_major -lt 2 || test 
$ac_cv_gnu_ld_vernr_minor -lt 14; then
+  ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
+fi
+  fi
 fi

--
der tom
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] Re: How to add samba admins in local admin group of workstations

2004-11-13 Thread Claudiney Soares
Hi Jim,

I use tdbsam backend. 

Thanks,

Claudiney
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] 3.0.8pre2 and tdbackup

2004-11-13 Thread Thomas Bork
Gerald (Jerry) Carter schrieb:
| backing up and verifying _printing_ databases uses 20-96% cpu and
| takes a long time (there are only few entries and smbd
| and nmbd were not running):
|
| Is this normal?
Should be really fast.  But you don't have to worry about the
printing/*tdb files.  They're just cache files anyways.
but if they are corrupt, printing is not possible, isn't it?
That why my intention was to backup and check all tdb's in init.d.
--
der tom
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] samba and a kernel oops on nfsd

2004-11-13 Thread Don Shesnicky
 
Sorry to parachute in here with an emergency question but I do have a 
big problem and I want to eliminate samba as a possibility. I have a
redhat 7.2 
server that has been solid until last Wed. On that day I had installed
samba 
on it from the redhat rpms. That night it went down with a kernel oops
on nfsd.
I shutdown samba but left it installed. 
 
It has gone down again today but the messages file blanks out I would
guess 
at the time it went down, similar characteristics though - no nfs
serving of disks
and system seems partially up - I can telnet to the apache web port and
get a
connection but no pages, I can ftp to it and get a connected to x
but no
actual login prompt. 
 
Could the samba install be related or still affecting this system in
some way?
 
Thanks,
Don
 
 
Nov 10 20:29:37 torsa kernel: Unable to handle kernel NULL pointer
dereference at virtual address 0033
Nov 10 20:29:37 torsa kernel:  printing eip:
Nov 10 20:29:37 torsa kernel: c012b8e0
Nov 10 20:29:37 torsa kernel: *pde = 
Nov 10 20:29:37 torsa kernel: Oops: 0002
Nov 10 20:29:37 torsa kernel: CPU:1
Nov 10 20:29:37 torsa kernel: EIP:0010:[__remove_inode_page+80/112]
snip
Nov 10 20:29:37 torsa kernel: Call Trace: [remove_inode_page+103/128]
[truncate_list_pages+560/704]
[e1000:__insmod_e1000_O/lib/modules/2.4.7-10smp/kernel/drivers/net+-1258
886/96] [truncate_inode_pages+94/192] [vmtruncate+180/576]
Nov 10 20:29:37 torsa kernel: Call Trace: [c012b967] [c012bf30]
[f8873a7a] [c012c01e] [c01298b4]
Nov 10 20:29:37 torsa kernel:[inode_setattr+38/224]
[e1000:__insmod_e1000_O/lib/modules/2.4.7-10smp/kernel/drivers/net+-1259
208/96] [sd_mod:sd+2202864/45428268] [notify_change+125/496]
[sd_mod:sd+2206751/45424381] [sd_mod:sd+2228154/45402978]
snip
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] Recycle does not work in [homes]

2004-11-13 Thread Robert S
I have just upgraded to samba 3.0.8.  I've managed to get recycle to work in 
shares, but it won't work in [homes] shares.

I have My Documents pointing to //server/robert.  If I delete a file there 
it does not end up in //server/robert/.recycle.

Is there a fix for this or is it intended behaviour? 



-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Recycle does not work in [homes]

2004-11-13 Thread Holger Krull
Send your conf please.
I have My Documents pointing to //server/robert.  If I delete a file there 
it does not end up in //server/robert/.recycle.

Is there a fix for this or is it intended behaviour? 
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] 98 reboots after login

2004-11-13 Thread robert
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

I'll have to test that, but I know this isn't the case now. The accounts that 
crash on the problem machines work fine on other machines. Permissions 
shouldn't change depending on which machine. (Is there a way to change rights 
depending on where you login from? I remember NT4.0 could limit logins to 
specific clients.) Doesn't matter which account I use either. I'm really 
starting to think it's local to the client and may not have anything to with 
the server. But why two clients and not the rest, and why do 2 others do it 
only intermittently?

On Saturday 13 November 2004 17:08, you wrote:
 I remember this happening if a user can't write to his home directory.

  Yes. I removed all startup programs and services using a clean boot
  procedure to no avail. I doubt that was the cause anyway. The samba
  machine has a simple login script. The reboot happens before the script
  is called.
 
  On Friday 12 November 2004 23:30, Kemas wrote:

- -- 
Fail to learn history-repeat it.
Fail to learn rights-lose them.
Learn both-get screwed by previous two groups.
Public key is at http://home.swbell.net/berzerke/robert.key
Fingerprint: 0D70 9ADF B5A7 45E7 A853 4B1C 8E0F 4324 C39D 44A2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBlpZAjg9DJMOdRKIRArc1AKCAXb/7dCgardD17msnOaL4vICVbwCZAeah
XpWw3rdLYsYsjdPg865X25M=
=1Wca
-END PGP SIGNATURE-
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] Re: Recycle does not work in [homes]

2004-11-13 Thread Robert S
 Send your conf please.

Incidentally  - I've done a workaround where 
/home/user/.documents/RECYCLER is symlinked to a location in /tmp.  Seems 
to achieve a similar result.  I'd be interested to know whats happening here 
though.

smb.conf:

[global]
workgroup = HOME
netbios name = MYSERVER
server string = Samba Server
encrypt passwords = Yes
smb passwd file = /etc/samba/private/smbpasswd
log file = /var/log/samba.log
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
lock dir = /var/lock/samba
printing = cups
printcap name = cups

time server = yes
dos filetimes = yes
fake directory create times = yes
dos filetime resolution = yes
delete readonly = yes

vfs object = vscan-clamav,recycle
vscan-clamav: config-file = /etc/samba/vscan-clamav.conf
recycle: config-file = /etc/samba/recycle.conf

[homes]
comment = Home Directories
path = /home/%S/.documents
valid users = %S
read only = No
browseable = No

[public]
path = /pub
create mask = 774
force group = users
read only = No
guest ok = Yes
browseable = yes

[printers]
comment = All Printer
path = /var/spool/samba
browseable = yes
printable = yes

My recycle.conf:

name = .recycle
mode = KEEP_DIRECTORIES|VERSIONS|TOUCH
maxsize = 1000
exclude = *.tmp|*.temp|*.o|*.obj|~$*
excludedir = /tmp|/temp|/cache
noversions = *.doc|*.xls|*.ppt



-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Re: Recycle does not work in [homes]

2004-11-13 Thread Holger Krull
My recycle.conf:
name = .recycle
mode = KEEP_DIRECTORIES|VERSIONS|TOUCH
maxsize = 1000
exclude = *.tmp|*.temp|*.o|*.obj|~$*
excludedir = /tmp|/temp|/cache
noversions = *.doc|*.xls|*.ppt
You are using samba 2.x.
I don't know about recycle there, sorry
--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


[Samba] Re: Re: Recycle does not work in [homes]

2004-11-13 Thread Robert S
 You are using samba 2.x.
 I don't know about recycle there, sorry

I'm actually using samba 3.0.8.  What makes you think that its 2.x?

Is there anything in my config that's right for 2.x and wrong for 3.x?? 



-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Re: Recycle does not work in [homes]

2004-11-13 Thread Matthias Spork
Hallo Robert,
I put the recycle-configuration in every share, I want to activate it for.
[homes]
   comment = Home Directories
   path = /home/%S/.documents
   valid users = %S
   read only = No
   browseable = No
   vfs object = recycle
   recycle:repository=.recycle
   recycle:versions=True
   recycle:keeptree=True
[]
matze
Robert S schrieb:
Send your conf please.
   

Incidentally  - I've done a workaround where 
/home/user/.documents/RECYCLER is symlinked to a location in /tmp.  Seems 
to achieve a similar result.  I'd be interested to know whats happening here 
though.

smb.conf:
[global]
   workgroup = HOME
   netbios name = MYSERVER
   server string = Samba Server
   encrypt passwords = Yes
   smb passwd file = /etc/samba/private/smbpasswd
   log file = /var/log/samba.log
   socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
   lock dir = /var/lock/samba
   printing = cups
   printcap name = cups
   time server = yes
   dos filetimes = yes
   fake directory create times = yes
   dos filetime resolution = yes
   delete readonly = yes
   vfs object = vscan-clamav,recycle
   vscan-clamav: config-file = /etc/samba/vscan-clamav.conf
   recycle: config-file = /etc/samba/recycle.conf
[homes]
   comment = Home Directories
   path = /home/%S/.documents
   valid users = %S
   read only = No
   browseable = No
[public]
   path = /pub
   create mask = 774
   force group = users
   read only = No
   guest ok = Yes
   browseable = yes
[printers]
   comment = All Printer
   path = /var/spool/samba
   browseable = yes
   printable = yes
My recycle.conf:
name = .recycle
mode = KEEP_DIRECTORIES|VERSIONS|TOUCH
maxsize = 1000
exclude = *.tmp|*.temp|*.o|*.obj|~$*
excludedir = /tmp|/temp|/cache
noversions = *.doc|*.xls|*.ppt

 

--
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Rejoin Domain

2004-11-13 Thread Andrew Bartlett
On Sun, 2004-11-14 at 04:07, Norman Zhang wrote:
 I've samba 3.0.2 joined to a NT 4.0 domain as a domain member server.
 
 # net rpc join -U -UAdministrator%password
 
 Windows clients access it using winbind. If I upgrade all NT 4.0 servers 
 to W2K3 AD,
 
 # net ads join -U Administrator%password
 
 do I need to rejoin the samba servers to AD? Will winbind continue to 
 work? I think W2K3 by default uses kerberos. Will all uid.gid mapping be 
 lost?

You should rejoin, as we set a few things in AD when we join.  The
mapping tables and everything else are preserved, we just renew the
account details.

Andrew Bartlett

-- 
Andrew Bartlett [EMAIL PROTECTED]
Authentication Developer, Samba Teamhttp://samba.org
Student Network Administrator, Hawker College   [EMAIL PROTECTED]


signature.asc
Description: This is a digitally signed message part
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba

Re: [Samba] samba and a kernel oops on nfsd

2004-11-13 Thread Andrew Bartlett
On Sun, 2004-11-14 at 07:15, Don Shesnicky wrote:
  Sorry to parachute in here with an emergency question but I do have a 
 big problem and I want to eliminate samba as a possibility. I have a
 redhat 7.2 
 server that has been solid until last Wed. On that day I had installed
 samba 
 on it from the redhat rpms. That night it went down with a kernel oops
 on nfsd.
 I shutdown samba but left it installed. 
  
 It has gone down again today but the messages file blanks out I would
 guess 
 at the time it went down, similar characteristics though - no nfs
 serving of disks
 and system seems partially up - I can telnet to the apache web port and
 get a
 connection but no pages, I can ftp to it and get a connected to x
 but no
 actual login prompt. 
  
 Could the samba install be related or still affecting this system in
 some way?

If your kernel crashes, then it's a kernel bug.  Are you running the
latest update kernel from Fedora Legacy?  You should be able to use the
update kernel for RH 7.3.

Andrew Bartlett

-- 
Andrew Bartlett [EMAIL PROTECTED]
Authentication Developer, Samba Teamhttp://samba.org
Student Network Administrator, Hawker College   [EMAIL PROTECTED]


signature.asc
Description: This is a digitally signed message part
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba

[Samba] Re: Re: Recycle does not work in [homes]

2004-11-13 Thread Robert S
 I put the recycle-configuration in every share, I want to activate it for.

Didn't seem to work for me. 



-- 
To unsubscribe from this list go to the following URL and read the
instructions:  http://lists.samba.org/mailman/listinfo/samba


svn commit: samba r3722 - in branches/SAMBA_4_0/source/gtk: common tools

2004-11-13 Thread metze
Author: metze
Date: 2004-11-13 11:33:01 + (Sat, 13 Nov 2004)
New Revision: 3722

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

Log:
- add userdomain in the binding dialog

- print samba_version_string() on Help-About

- some minor format fixes

metze 

Modified:
   branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
   branches/SAMBA_4_0/source/gtk/common/gtk-smb.h
   branches/SAMBA_4_0/source/gtk/tools/gwcrontab.c
   branches/SAMBA_4_0/source/gtk/tools/gwsam.c


Changeset:
Modified: branches/SAMBA_4_0/source/gtk/common/gtk-smb.c
===
--- branches/SAMBA_4_0/source/gtk/common/gtk-smb.c  2004-11-13 07:44:50 UTC 
(rev 3721)
+++ branches/SAMBA_4_0/source/gtk/common/gtk-smb.c  2004-11-13 11:33:01 UTC 
(rev 3722)
@@ -26,10 +26,11 @@
 void gtk_show_werror(GtkWidget *win, WERROR err) 
 {
GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(win), 
-GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
-Windows error: %s\n, win_errstr(err));
+   
GTK_DIALOG_DESTROY_WITH_PARENT,
+   GTK_MESSAGE_ERROR,
+   GTK_BUTTONS_CLOSE,
+   Windows error: %s\n,
+   win_errstr(err));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
 }
@@ -37,10 +38,11 @@
 void gtk_show_ntstatus(GtkWidget *win, NTSTATUS status) 
 {
GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(win), 
-GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
-Windows error: %s\n, nt_errstr(status));
+   
GTK_DIALOG_DESTROY_WITH_PARENT,
+   GTK_MESSAGE_ERROR,
+   GTK_BUTTONS_CLOSE,
+   Windows error: %s\n,
+   nt_errstr(status));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
 }
@@ -81,6 +83,7 @@
GtkWidget *label3;
GtkWidget *table1;
GtkWidget *lbl_username;
+   GtkWidget *lbl_userdomain;
GtkWidget *lbl_password;
GtkWidget *btn_browse;
GtkWidget *label9;
@@ -170,42 +173,55 @@
gtk_rpc_binding_dialog-frame_credentials = gtk_frame_new (NULL);
gtk_box_pack_start (GTK_BOX (dialog_vbox1), 
gtk_rpc_binding_dialog-frame_credentials, TRUE, TRUE, 0);
 
-   table1 = gtk_table_new (3, 2, FALSE);
+   table1 = gtk_table_new (4, 2, FALSE);
gtk_container_add (GTK_CONTAINER 
(gtk_rpc_binding_dialog-frame_credentials), table1);
 
lbl_username = gtk_label_new (Username:);
-   gtk_table_attach (GTK_TABLE (table1), lbl_username, 0, 1, 0, 1,
+   gtk_table_attach (GTK_TABLE (table1), lbl_username, 0,1, 0,1,
  (GtkAttachOptions) (GTK_FILL),
  (GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (lbl_username), 0, 0.5);
 
+   lbl_userdomain= gtk_label_new (Domain:);
+   gtk_table_attach (GTK_TABLE (table1), lbl_userdomain, 0,1, 1,2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+   gtk_misc_set_alignment (GTK_MISC (lbl_userdomain), 0, 0.5);
+
lbl_password = gtk_label_new (Password:);
-   gtk_table_attach (GTK_TABLE (table1), lbl_password, 0, 1, 1, 2,
+   gtk_table_attach (GTK_TABLE (table1), lbl_password, 0,1, 2,3,
  (GtkAttachOptions) (GTK_FILL),
  (GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (lbl_password), 0, 0.5);
 
label9 = gtk_label_new ();
-   gtk_table_attach (GTK_TABLE (table1), label9, 0, 1, 2, 3,
+   gtk_table_attach (GTK_TABLE (table1), label9, 0,1, 3,4,
  (GtkAttachOptions) (GTK_FILL),
  (GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
 
-   gtk_rpc_binding_dialog-entry_password = gtk_entry_new ();
-   gtk_entry_set_visibility (GTK_ENTRY 
(gtk_rpc_binding_dialog-entry_password), FALSE);
-   gtk_table_attach (GTK_TABLE (table1), 
gtk_rpc_binding_dialog-entry_password, 1, 2, 1, 2,
+   gtk_rpc_binding_dialog-entry_username = gtk_entry_new ();
+   gtk_table_attach (GTK_TABLE (table1), 
gtk_rpc_binding_dialog-entry_username, 1,2, 0,1,
  (GtkAttachOptions) 

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

2004-11-13 Thread abartlet
Author: abartlet
Date: 2004-11-13 13:33:45 + (Sat, 13 Nov 2004)
New Revision: 3723

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

Log:
Now that timestring() always returns talloc'ed memory, we don't need
this talloc strdup here (do we?).

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/time.c
===
--- branches/SAMBA_4_0/source/lib/time.c2004-11-13 11:33:01 UTC (rev 
3722)
+++ branches/SAMBA_4_0/source/lib/time.c2004-11-13 13:33:45 UTC (rev 
3723)
@@ -347,7 +347,7 @@
 const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt)
 {
time_t t = nt_time_to_unix(nt);
-   return talloc_strdup(mem_ctx, timestring(mem_ctx, t));
+   return timestring(mem_ctx, t);
 }
 
 



svn commit: samba r3724 - in branches/SAMBA_4_0/source: gtk/common gtk/tools libnet librpc/idl rpc_server/samr torture/rpc

2004-11-13 Thread abartlet
Author: abartlet
Date: 2004-11-13 13:45:41 + (Sat, 13 Nov 2004)
New Revision: 3724

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

Log:
Rename a number of structures, for better consistance between SAMR and
NETLOGON.

In particular, rename samr_Name to samr_String - given that many
strings in this pipe are not 'names', the previous was just confusing.
(I look forward to PIDL turning these into simple char * some day...).

Also export out a few changes from testjoin.c to allow for how I have
written the new RPC-SAMSYNC test.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/gtk/common/select.c
   branches/SAMBA_4_0/source/gtk/tools/gwsam.c
   branches/SAMBA_4_0/source/libnet/libnet_passwd.c
   branches/SAMBA_4_0/source/librpc/idl/netlogon.idl
   branches/SAMBA_4_0/source/librpc/idl/samr.idl
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
   branches/SAMBA_4_0/source/torture/rpc/samr.c
   branches/SAMBA_4_0/source/torture/rpc/schannel.c
   branches/SAMBA_4_0/source/torture/rpc/testjoin.c


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


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

2004-11-13 Thread abartlet
Author: abartlet
Date: 2004-11-13 13:48:59 + (Sat, 13 Nov 2004)
New Revision: 3725

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

Log:
The new RPC-SAMSYNC test, complete with SAMR comparisons.  This is
certainly not complete, we need to verify all incoming data, not just
accounts.

This needs to be exercised against some 'intersting' users, but for
now it shows that the IDL is already very accurate, particularly after
the previous commits cleanups of names.

Also commit the changes to keep RPC-LOGIN building. 

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/rpc/samsync.c
   branches/SAMBA_4_0/source/torture/rpc/xplogin.c


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


svn commit: samba r3726 - in branches/SAMBA_4_0/source/build: m4 smb_build

2004-11-13 Thread jelmer
Author: jelmer
Date: 2004-11-13 18:20:33 + (Sat, 13 Nov 2004)
New Revision: 3726

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

Log:
More simplifications/fixes in the build system

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/build/smb_build/core.m4
   branches/SAMBA_4_0/source/build/smb_build/depend.pm
   branches/SAMBA_4_0/source/build/smb_build/main.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/build/smb_build/public.m4


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


svn commit: samba r3727 - in branches/SAMBA_3_0/source/printing: .

2004-11-13 Thread jmcd
Author: jmcd
Date: 2004-11-14 03:12:46 + (Sun, 14 Nov 2004)
New Revision: 3727

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

Log:
Update from Rob Foehl ([EMAIL PROTECTED]):
Try modifying printer before adding it,since add logic appends ObjectClass to 
mods, which caused a contraint violation when modifying an already published 
printer.

Also cleanup the check_published_printers() logic when verifying published 
status on startup.

Modified:
   branches/SAMBA_3_0/source/printing/nt_printing.c


Changeset:
Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===
--- branches/SAMBA_3_0/source/printing/nt_printing.c2004-11-13 18:20:33 UTC 
(rev 3726)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c2004-11-14 03:12:46 UTC 
(rev 3727)
@@ -2707,9 +2707,12 @@
printer-info_2-sharename);
 
/* publish it */
-   ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, mods);
-   if (LDAP_ALREADY_EXISTS == ads_rc.err.rc)
-   ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, mods);
+   ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, mods);
+   if (ads_rc.err.rc == LDAP_NO_SUCH_OBJECT)
+   ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, mods);
+
+   if (!ADS_ERR_OK(ads_rc))
+   DEBUG(3, (error publishing %s: %s\n, 
printer-info_2-sharename, ads_errstr(ads_rc)));

talloc_destroy(ctx);
 
@@ -2831,11 +2834,9 @@
 {
ADS_STATUS ads_rc;
ADS_STRUCT *ads = NULL;
-   void *res = NULL;
int snum;
int n_services = lp_numservices();
NT_PRINTER_INFO_LEVEL *printer = NULL;
-   WERROR win_rc;
 
ads = ads_init(NULL, NULL, NULL);
if (!ads) {
@@ -2859,27 +2860,12 @@
if (!(lp_snum_ok(snum)  lp_print_ok(snum)))
continue;
 
-   if (!W_ERROR_IS_OK(get_a_printer(NULL, printer, 2,
-lp_servicename(snum))) ||
-   !(printer-info_2-attributes  
PRINTER_ATTRIBUTE_PUBLISHED))
-   goto next;
+   if (W_ERROR_IS_OK(get_a_printer(NULL, printer, 2,
+   lp_servicename(snum))) 
+   (printer-info_2-attributes  PRINTER_ATTRIBUTE_PUBLISHED))
+   nt_printer_publish_ads(ads, printer);
 
-   DEBUG(5, (checking directory for printer %s\n, 
printer-info_2-printername));
-   ads_rc = ads_find_printer_on_server(ads, res,
-   printer-info_2-sharename, global_myname());
-   if (ADS_ERR_OK(ads_rc)  ads_count_replies(ads, res)) {
-   DEBUG(5, (printer %s is in directory\n, 
printer-info_2-printername));
-   goto next;
-   }
-
-   win_rc = nt_printer_publish_ads(ads, printer);
-   if (!W_ERROR_IS_OK(win_rc))
-   DEBUG(3, (error publishing %s: %s\n, 
printer-info_2-sharename, dos_errstr(win_rc)));
-
-   next:
free_a_printer(printer, 2);
-   ads_msgfree(ads, res);
-   res = NULL;
}
 
ads_destroy(ads);



svn commit: samba r3728 - in trunk/source/printing: .

2004-11-13 Thread jmcd
Author: jmcd
Date: 2004-11-14 03:54:48 + (Sun, 14 Nov 2004)
New Revision: 3728

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

Log:
Merge from 3.0: patch for publishing from Rob Foehl ([EMAIL PROTECTED])

Modified:
   trunk/source/printing/nt_printing.c


Changeset:
Modified: trunk/source/printing/nt_printing.c
===
--- trunk/source/printing/nt_printing.c 2004-11-14 03:12:46 UTC (rev 3727)
+++ trunk/source/printing/nt_printing.c 2004-11-14 03:54:48 UTC (rev 3728)
@@ -2707,9 +2707,12 @@
printer-info_2-sharename);
 
/* publish it */
-   ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, mods);
-   if (LDAP_ALREADY_EXISTS == ads_rc.err.rc)
-   ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, mods);
+   ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, mods);
+   if (ads_rc.err.rc == LDAP_NO_SUCH_OBJECT)
+   ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, mods);
+
+   if (!ADS_ERR_OK(ads_rc))
+   DEBUG(3, (error publishing %s: %s\n, 
printer-info_2-sharename, ads_errstr(ads_rc)));

talloc_destroy(ctx);
 
@@ -2831,11 +2834,9 @@
 {
ADS_STATUS ads_rc;
ADS_STRUCT *ads = NULL;
-   void *res = NULL;
int snum;
int n_services = lp_numservices();
NT_PRINTER_INFO_LEVEL *printer = NULL;
-   WERROR win_rc;
 
ads = ads_init(NULL, NULL, NULL);
if (!ads) {
@@ -2859,27 +2860,12 @@
if (!(lp_snum_ok(snum)  lp_print_ok(snum)))
continue;
 
-   if (!W_ERROR_IS_OK(get_a_printer(NULL, printer, 2,
-lp_servicename(snum))) ||
-   !(printer-info_2-attributes  
PRINTER_ATTRIBUTE_PUBLISHED))
-   goto next;
+   if (W_ERROR_IS_OK(get_a_printer(NULL, printer, 2,
+   lp_servicename(snum))) 
+   (printer-info_2-attributes  PRINTER_ATTRIBUTE_PUBLISHED))
+   nt_printer_publish_ads(ads, printer);
 
-   DEBUG(5, (checking directory for printer %s\n, 
printer-info_2-printername));
-   ads_rc = ads_find_printer_on_server(ads, res,
-   printer-info_2-sharename, global_myname());
-   if (ADS_ERR_OK(ads_rc)  ads_count_replies(ads, res)) {
-   DEBUG(5, (printer %s is in directory\n, 
printer-info_2-printername));
-   goto next;
-   }
-
-   win_rc = nt_printer_publish_ads(ads, printer);
-   if (!W_ERROR_IS_OK(win_rc))
-   DEBUG(3, (error publishing %s: %s\n, 
printer-info_2-sharename, dos_errstr(win_rc)));
-
-   next:
free_a_printer(printer, 2);
-   ads_msgfree(ads, res);
-   res = NULL;
}
 
ads_destroy(ads);