Changeset 77 for trunk/samba/source/nsswitch/wb_client.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/nsswitch/wb_client.c (modified) (4 diffs)

trunk/samba/source/nsswitch/wb_client.c

@@ -8 +8 @@
    
    This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
+   modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
    
    This library is distributed in the hope that it will be useful,
@@ -17 +17 @@
    Library General Public License for more details.
    
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA  02111-1307, USA.   
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -148 +146 @@
         }
 
-        if ((num_rids != 0) && (ridlist == NULL)) {
+        if (ridlist == NULL) {
                 return False;
         }
@@ -166 +164 @@
         *domain_name = talloc_strdup(mem_ctx, response.data.domain_name);
 
-        if (num_rids) {
-                *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
-                *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
-
-                if ((*names == NULL) || (*types == NULL)) {
-                        goto fail;
-                }
-        } else {
-                *names = NULL;
-                *types = NULL;
+        *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
+        *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+
+        if ((*names == NULL) || (*types == NULL)) {
+                goto fail;
         }