Re: [Samba] question difference of roaming profile between WinXP and Win7

2010-04-04 Thread r . s1
Hello Christian
This what I expected with Win7 clients. But in my case XP and 7 are using the 
same profile (which shouldn't be), but from different shares. It seems XP is 
connecting to the profiles via my share [nt-profile] and Win7 via share 
[nt-profile.v2]. If i comment [nt-profile.v2], Win7 cannot connect to the 
profile (it starts always with an temporary profile). My username.V2 profiles 
are still empty. I never saw an logentry pointing to username.V2. Several 
hits in google answers just to create/copy a username.V2 directory and that's 
it. Which didn't work for me. [nt-profile.v2] was just a guess due to entries 
from the samba logs. The only possibility I see, is to define path = 
/BUERO/samba/nt-profile/%u.V2 (or something similar) in [nt-profile.v2] to 
differentiate between XP and 7. Who is adding the v2 extension? Is it samba or 
Win7?
I'm running Samba 3.4.3.

regards Robert

 Original-Nachricht 
 Datum: Sun,  4 Apr 2010 00:00:40 +0200 (CEST)
 Von: Christian Rost c...@rocon-it.de
 An: r...@gmx.at
 CC: samba@lists.samba.org
 Betreff: RE: [Samba] question difference of roaming profile between WinXP and 
 Win7

 Hi,
 
 IMHO both profiles can stay within the same share, so you don't need a
 separate .v2 share. It's the same with Windows 2003 Server and a mixture of
 XP/ Vista/Seven Clients.
 
 What you need to keep in mind is that Windows XP profiles are not
 compatible with Vista/Seven profiles - hence the .v2 suffix and they're
 completely different profiles. When you're logging into Vista/Seven for the 
 first
 time, your exisitng pre-Vista profile will be converted and will be renamed
 to username.v2. Each time you're logging into Vista/ Seven the
 username.v2 profile will be updated, and each time you're logging into XP 
 your
 username profile will be updated.  
 
 Cheers,
 
 Christian
 
 ===
 Dipl.-Ing. Christian Rost
 roCon - Informationstechnologie
 Glatzer Weg 4
 
 44534 Lünen
 
 fon: +49 (0) 2306 910 658
 fax: +49 (0) 2306 910 664
 url: http://www.rocon-it.de
 
 
 
 r...@gmx.at wrote
 Subject: [Samba] question difference of roaming profile between WinXP
 and   Win7
 Date: 03.04.2010 17:02
 
 Hello
 I want to add Win7 machine to my Samba PDC with WinXP clients. Google
 tells me I have to add a .V2 to my profiles. The samba log ask about a
 .v2
 share.
 Can someone explain me the difference of the v2 extension at the profile
 names and the roaming profile share?
 Following my settings:
 
 smb.conf:
 [global]
 logon path = \\%L\nt-profile
 logon home = \\%L\nt-profile
 
 [nt-profile]
 comment = Client Profiles
 path = /BUERO/samba/nt-profile/%u
 read only = No
 create mask = 0600
 directory mask = 0700
 
 [nt-profile.v2]
 comment = Client Profiles
 path = /BUERO/samba/nt-profile/%u
 read only = No
 create mask = 0600
 directory mask = 0700
 
 
 ls -l /BUERO/samba/nt-profile
 drwsrwsr-x 24 kira users  4096 2010-04-03 16:16 kira
 drwxr-sr-x  2 kira users  4096 2010-04-02 18:59 kira.V2
 
 These are 2 empty profiles.
 I logged on to user kira with an XP client, set the background colour to
 green and logged of. Profile kira was filled with data. Now I logged on
 to
 user kira with an Win7 client, the background was black. I set the
 background to yellow and logged of. The profile kira.V2 is still empty.
 Finally I logged on to kira with XP and the background was yellow. So
 Win7
 and XP are using the same profile, which should be if I understand mr.
 google right. I thought I just had to copy the roaming profiles to a
 profile with extension .V2.
 
 I found following in the samba log during Win7 logon:
   :
 get_referred_path: |nt-profile.V2| in dfs path \testserver\nt-profile.V2
 is not a dfs root.
   :
 Connect path is '/BUERO/samba/nt-profile/kira' for service
 [nt-profile.v2]
   :
 connect to service nt-profile.v2 initially as user kira (uid=524,
 gid=100)
 (pid 12087)
   :
 reduce_name [.] [/BUERO/samba/nt-profile/kira]
   :
 
 Further, there is a reference to nt-profile.V2 (uppercase V2) and next a
 connect to nt-profile.v2 (lowercase v2). What is the difference? Finally,
 the profile kira is used and not kira.V2. Why?
 
 Can someone explain me the correct setup of samba for Win7 clients?
 
 regards robert
 -- 
 Sicherer, schneller und einfacher. Die aktuellen Internet-Browser -
 jetzt kostenlos herunterladen! http://portal.gmx.net/de/go/atbrowser
 -- 
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://lists.samba.org/mailman/options/samba
 

-- 
Sicherer, schneller und einfacher. Die aktuellen Internet-Browser -
jetzt kostenlos herunterladen! http://portal.gmx.net/de/go/atbrowser
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] question difference of roaming profile between WinXP and Win7

2010-04-04 Thread Damien Dye
Robert

remove the .V2 share and then remove your profiles from vista/win 7 at this
reg key

HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList

then all will work as expected.


--
Damien Dye BSC(hon)



On 4 April 2010 16:15, r...@gmx.at wrote:

 Hello Christian
 This what I expected with Win7 clients. But in my case XP and 7 are using
 the same profile (which shouldn't be), but from different shares. It seems
 XP is connecting to the profiles via my share [nt-profile] and Win7 via
 share [nt-profile.v2]. If i comment [nt-profile.v2], Win7 cannot connect to
 the profile (it starts always with an temporary profile). My username.V2
 profiles are still empty. I never saw an logentry pointing to username.V2.
 Several hits in google answers just to create/copy a username.V2 directory
 and that's it. Which didn't work for me. [nt-profile.v2] was just a guess
 due to entries from the samba logs. The only possibility I see, is to define
 path = /BUERO/samba/nt-profile/%u.V2 (or something similar) in
 [nt-profile.v2] to differentiate between XP and 7. Who is adding the v2
 extension? Is it samba or Win7?
 I'm running Samba 3.4.3.

 regards Robert

  Original-Nachricht 
  Datum: Sun,  4 Apr 2010 00:00:40 +0200 (CEST)
  Von: Christian Rost c...@rocon-it.de
  An: r...@gmx.at
  CC: samba@lists.samba.org
  Betreff: RE: [Samba] question difference of roaming profile between WinXP
 and Win7

  Hi,
 
  IMHO both profiles can stay within the same share, so you don't need a
  separate .v2 share. It's the same with Windows 2003 Server and a mixture
 of
  XP/ Vista/Seven Clients.
 
  What you need to keep in mind is that Windows XP profiles are not
  compatible with Vista/Seven profiles - hence the .v2 suffix and they're
  completely different profiles. When you're logging into Vista/Seven for
 the first
  time, your exisitng pre-Vista profile will be converted and will be
 renamed
  to username.v2. Each time you're logging into Vista/ Seven the
  username.v2 profile will be updated, and each time you're logging
 into XP your
  username profile will be updated.
 
  Cheers,
 
  Christian
 
  ===
  Dipl.-Ing. Christian Rost
  roCon - Informationstechnologie
  Glatzer Weg 4
 
  44534 Lünen
 
  fon: +49 (0) 2306 910 658
  fax: +49 (0) 2306 910 664
  url: http://www.rocon-it.de
 
 
 
  r...@gmx.at wrote
  Subject: [Samba] question difference of roaming profile between WinXP
  and   Win7
  Date: 03.04.2010 17:02
 
  Hello
  I want to add Win7 machine to my Samba PDC with WinXP clients. Google
  tells me I have to add a .V2 to my profiles. The samba log ask about a
  .v2
  share.
  Can someone explain me the difference of the v2 extension at the profile
  names and the roaming profile share?
  Following my settings:
  
  smb.conf:
  [global]
  logon path = \\%L\nt-profile
  logon home = \\%L\nt-profile
  
  [nt-profile]
  comment = Client Profiles
  path = /BUERO/samba/nt-profile/%u
  read only = No
  create mask = 0600
  directory mask = 0700
  
  [nt-profile.v2]
  comment = Client Profiles
  path = /BUERO/samba/nt-profile/%u
  read only = No
  create mask = 0600
  directory mask = 0700
  
  
  ls -l /BUERO/samba/nt-profile
  drwsrwsr-x 24 kira users  4096 2010-04-03 16:16 kira
  drwxr-sr-x  2 kira users  4096 2010-04-02 18:59 kira.V2
  
  These are 2 empty profiles.
  I logged on to user kira with an XP client, set the background colour to
  green and logged of. Profile kira was filled with data. Now I logged on
  to
  user kira with an Win7 client, the background was black. I set the
  background to yellow and logged of. The profile kira.V2 is still empty.
  Finally I logged on to kira with XP and the background was yellow. So
  Win7
  and XP are using the same profile, which should be if I understand mr.
  google right. I thought I just had to copy the roaming profiles to a
  profile with extension .V2.
  
  I found following in the samba log during Win7 logon:
:
  get_referred_path: |nt-profile.V2| in dfs path \testserver\nt-profile.V2
  is not a dfs root.
:
  Connect path is '/BUERO/samba/nt-profile/kira' for service
  [nt-profile.v2]
:
  connect to service nt-profile.v2 initially as user kira (uid=524,
  gid=100)
  (pid 12087)
:
  reduce_name [.] [/BUERO/samba/nt-profile/kira]
:
  
  Further, there is a reference to nt-profile.V2 (uppercase V2) and next a
  connect to nt-profile.v2 (lowercase v2). What is the difference?
 Finally,
  the profile kira is used and not kira.V2. Why?
  
  Can someone explain me the correct setup of samba for Win7 clients?
  
  regards robert
  --
  Sicherer, schneller und einfacher. Die aktuellen Internet-Browser -
  jetzt kostenlos herunterladen! http://portal.gmx.net/de/go/atbrowser
  --
  To unsubscribe from this list go to the following URL and read the
  instructions:  

Re: [Samba] question difference of roaming profile between WinXP and Win7

2010-04-04 Thread John Drescher
On Sun, Apr 4, 2010 at 11:37 AM, Damien Dye damien.j@googlemail.com wrote:
 Robert

 remove the .V2 share and then remove your profiles from vista/win 7 at this
 reg key

 HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList

 then all will work as expected.


It's interesting to me that everyone gives different advice that works...
I mean roaming profiles (XP and Win7) work for me with the 2 separate
shares pointing to 2 different places..

I guess there are several working solutions to this problem..

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


[Samba] Samba user problem

2010-04-04 Thread Poulter, Dale
We are using RHEL release 5.5, Samba version 3.0.33-3.28.el5, and active 
directory.  I have been able to successfully join the domain and have created a 
share.  The problem is that I can only map the share with an ADS username that 
is the same as a username on the unix server.  I still need to use the ADS 
password so it appears to be connecting to the domain correctly.  Has anyone 
else encountered this issue?

--Dale

---
Dale Poulter
Automation Coordinator
Library Information Technology Services
Vanderbilt University
Suite 700
110 21st Avenue South
Nashville, TN  37240
(615)343-5388
(615)343-8834 (fax)
(615)207-9705 (cell)
dale.poul...@vanderbilt.edumailto:dale.poul...@vanderbilt.edu

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


Re: [Samba] Samba user problem

2010-04-04 Thread Poulter, Dale
All,

As if often the case ,  I quickly found a typo in my nsswitch file immediately 
after sending the email.  Thanks.

From: Poulter, Dale
Sent: Sunday, April 04, 2010 3:20 PM
To: samba@lists.samba.org
Subject: Samba user problem

We are using RHEL release 5.5, Samba version 3.0.33-3.28.el5, and active 
directory.  I have been able to successfully join the domain and have created a 
share.  The problem is that I can only map the share with an ADS username that 
is the same as a username on the unix server.  I still need to use the ADS 
password so it appears to be connecting to the domain correctly.  Has anyone 
else encountered this issue?

--Dale

---
Dale Poulter
Automation Coordinator
Library Information Technology Services
Vanderbilt University
Suite 700
110 21st Avenue South
Nashville, TN  37240
(615)343-5388
(615)343-8834 (fax)
(615)207-9705 (cell)
dale.poul...@vanderbilt.edumailto:dale.poul...@vanderbilt.edu

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


Build status as of Sun Apr 4 06:00:02 2010

2010-04-04 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2010-04-03 
00:00:02.0 -0600
+++ /home/build/master/cache/broken_results.txt 2010-04-04 00:00:03.0 
-0600
@@ -1,22 +1,22 @@
-Build status as of Sat Apr  3 06:00:01 2010
+Build status as of Sun Apr  4 06:00:02 2010
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   34 15 0 
-ldb  34 34 0 
-libreplace   33 11 0 
+ccache   35 16 0 
+ldb  35 35 0 
+libreplace   34 12 0 
 lorikeet 0  0  0 
 pidl 23 23 0 
 ppp  17 0  0 
-rsync33 11 0 
+rsync34 11 0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 32 26 1 
-samba_3_master 32 32 4 
-samba_3_next 29 28 4 
-samba_4_0_test 34 34 1 
-samba_4_0_waf 27 26 1 
-talloc   34 11 0 
-tdb  32 22 0 
+samba_3_current 33 27 1 
+samba_3_master 33 33 3 
+samba_3_next 30 28 4 
+samba_4_0_test 35 35 1 
+samba_4_0_waf 28 27 1 
+talloc   35 12 0 
+tdb  33 23 0 
 


[SCM] Samba Shared Repository - branch master updated

2010-04-04 Thread Volker Lendecke
The branch, master has been updated
   via  9b1f9da... libwbclient: Streamline result processing of 
wbcCredentialCache()
   via  b198283... libwbclient: Fix a memleak in wbcCredentialCache
  from  55aeb68... s4-python: Move dsdb_convert_schema_to_openldap to dsdb.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 9b1f9da43617d4bd370d5f18fea9b2533e417685
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 12:12:12 2010 +0200

libwbclient: Streamline result processing of wbcCredentialCache()

commit b198283f1ff7c268f604479290c7e6fb555a6267
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 12:11:08 2010 +0200

libwbclient: Fix a memleak in wbcCredentialCache

---

Summary of changes:
 nsswitch/libwbclient/wbc_pam.c |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 03039a2..b35284b 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -1223,10 +1223,9 @@ wbcErr wbcCredentialCache(struct 
wbcCredentialCacheParams *params,
goto fail;
}
 
-   winbindd_free_response(response);
*info = result;
-   return WBC_ERR_SUCCESS;
-
+   result = NULL;
+   status = WBC_ERR_SUCCESS;
 fail:
TALLOC_FREE(request.extra_data.data);
winbindd_free_response(response);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-04-04 Thread Kai Blin
The branch, master has been updated
   via  b1192bb... lib/replace: Don't use StrnCpy inside crypt.c
   via  781a0c0... lib/replace: use correct inttypes in crypt.c
  from  9b1f9da... libwbclient: Streamline result processing of 
wbcCredentialCache()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit b1192bbfc991af57736dba7c30fb4d92dd6f436c
Author: Kai Blin k...@samba.org
Date:   Sun Apr 4 13:51:02 2010 +0200

lib/replace: Don't use StrnCpy inside crypt.c

With this and the int32_t/int64_t change, talloc crossbuilds to android

commit 781a0c08467a29118be85e6ecd035d35fb105e84
Author: Kai Blin k...@samba.org
Date:   Sun Apr 4 13:42:15 2010 +0200

lib/replace: use correct inttypes in crypt.c

This makes the android crossbuild slightly less broken.

---

Summary of changes:
 lib/replace/crypt.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/crypt.c b/lib/replace/crypt.c
index 22341ce..3a067bc 100644
--- a/lib/replace/crypt.c
+++ b/lib/replace/crypt.c
@@ -46,11 +46,11 @@
 
 
 #ifndef long32
-#define long32 int32
+#define long32 int32_t
 #endif
 
 #ifndef long64
-#define long64 int64
+#define long64 int64_t
 #endif
 
 #ifndef ufc_long
@@ -665,7 +665,7 @@ char *ufc_crypt(const char *key,const char *salt)
  * Setup key schedule
  */
 clearmem(ktab, sizeof ktab);
-StrnCpy(ktab, key, 8);
+strncpy(ktab, key, 8);
 ufc_mk_keytab(ktab);
 
 /*


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-04-04 Thread Volker Lendecke
The branch, master has been updated
   via  6e40fa9... s3: Fix the GNU ld version detection on SLES
  from  b1192bb... lib/replace: Don't use StrnCpy inside crypt.c

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 6e40fa9b016cdbd43c973c9b61b581258c0c24a9
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 20:09:36 2010 +0200

s3: Fix the GNU ld version detection on SLES

On SLES 11 ld -v gives

GNU ld (GNU Binutils; SUSE Linux Enterprise 11) 2.19

The regexp to intended to detect the 2.19 is confused by the 11 in the
version string. I'm not really into regexps, and awk '{print $NF}' to me is 
a
simple (and hopefully portable) way to print the last field.

---

Summary of changes:
 source3/configure.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 76526d9..26ec10b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -233,7 +233,7 @@ if test $ac_cv_prog_gnu_ld = yes; then
 else
AC_MSG_CHECKING(GNU ld release version)
changequote(,)dnl
-   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 
's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
+   ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | awk '{print $NF}' 
| sed -n 's,\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
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`
changequote([,])dnl


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-04-04 Thread Volker Lendecke
The branch, master has been updated
   via  488fe76... libwbclient: Fix a memleak in wbcListTrusts
   via  50a625c... libwbclient: Fix memleaks in tests
   via  b1b723d... libwbclient: Fix a memleak in wbcListTrusts
  from  6e40fa9... s3: Fix the GNU ld version detection on SLES

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 488fe76a22b4550110d41068d721c30b337825b5
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 22:49:38 2010 +0200

libwbclient: Fix a memleak in wbcListTrusts

commit 50a625ce0edc13312030d24df4b0b7eeaa50bfb0
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 22:49:18 2010 +0200

libwbclient: Fix memleaks in tests

commit b1b723da6f7545f387ab64eb4ad2df2cf59e2623
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 4 22:26:40 2010 +0200

libwbclient: Fix a memleak in wbcListTrusts

---

Summary of changes:
 nsswitch/libwbclient/tests/wbclient.c |   10 ++
 nsswitch/libwbclient/wbc_util.c   |   12 +---
 2 files changed, 15 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/tests/wbclient.c 
b/nsswitch/libwbclient/tests/wbclient.c
index 0074040..a63811a 100644
--- a/nsswitch/libwbclient/tests/wbclient.c
+++ b/nsswitch/libwbclient/tests/wbclient.c
@@ -149,6 +149,7 @@ static bool test_wbc_sidtostring(struct torture_context 
*tctx)
wbcSidToString failed);
torture_assert_str_equal(tctx, sid_string, sid_string2,
sid strings differ);
+   wbcFreeMemory(sid_string2);
 
return true;
 }
@@ -165,6 +166,7 @@ static bool test_wbc_guidtostring(struct torture_context 
*tctx)
wbcGuidToString failed);
torture_assert_str_equal(tctx, guid_string, guid_string2,
guid strings differ);
+   wbcFreeMemory(guid_string2);
 
return true;
 }
@@ -185,6 +187,7 @@ static bool test_wbc_domain_info(struct torture_context 
*tctx)
wbcDomainInfo failed);
torture_assert(tctx, info,
wbcDomainInfo returned NULL pointer);
+   wbcFreeMemory(info);
 
return true;
 }
@@ -228,7 +231,9 @@ static bool test_wbc_users(struct torture_context *tctx)
wbcLookupSid returned no name);
torture_assert_wbc_ok(tctx, wbcLookupUserSids(sid, true, 
num_sids, sids),
wbcLookupUserSids failed);
+   wbcFreeMemory(sids);
}
+   wbcFreeMemory(users);
 
return true;
 }
@@ -295,7 +300,9 @@ static bool test_wbc_users_async(struct torture_context 
*tctx)
wbcLookupSid returned no name);
torture_assert_wbc_ok(tctx, wbcLookupUserSids(sid, true, 
num_sids, sids),
wbcLookupUserSids failed);
+   wbcFreeMemory(sids);
}
+   wbcFreeMemory(users);
 
return true;
 }
@@ -372,6 +379,7 @@ static bool test_wbc_trusts(struct torture_context *tctx)
wbcLookupSid returned no name);
*/
}
+   wbcFreeMemory(domains);
 
return true;
 }
@@ -390,6 +398,7 @@ static bool test_wbc_lookupdc(struct torture_context *tctx)
 
torture_assert_wbc_ok(tctx, wbcLookupDomainController(domain_name, 0, 
dc_info),
wbcLookupDomainController failed);
+   wbcFreeMemory(dc_info);
 
return true;
 }
@@ -408,6 +417,7 @@ static bool test_wbc_lookupdcex(struct torture_context 
*tctx)
 
torture_assert_wbc_ok(tctx, wbcLookupDomainControllerEx(domain_name, 
NULL, NULL, 0, dc_info),
wbcLookupDomainControllerEx failed);
+   wbcFreeMemory(dc_info);
 
return true;
 }
diff --git a/nsswitch/libwbclient/wbc_util.c b/nsswitch/libwbclient/wbc_util.c
index 2a1285e..5637b2e 100644
--- a/nsswitch/libwbclient/wbc_util.c
+++ b/nsswitch/libwbclient/wbc_util.c
@@ -24,6 +24,7 @@
 
 #include replace.h
 #include libwbclient.h
+#include ../winbind_client.h
 
 /** @brief Ping winbindd to see if the daemon is running
  *
@@ -466,16 +467,13 @@ wbcErr wbcListTrusts(struct wbcDomainInfo **domains, 
size_t *num_domains)
}
 
*domains = d_list;
+   d_list = NULL;
*num_domains = i;
 
  done:
-   if (!WBC_ERROR_IS_OK(wbc_status)) {
-   if (d_list)
-   talloc_free(d_list);
-   if (extra_data)
-   free(extra_data);
-   }
-
+   winbindd_free_response(response);
+   talloc_free(d_list);
+   free(extra_data);
return wbc_status;
 }
 


-- 
Samba Shared Repository