s3: Fix some False/NULL hickups

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Tue Dec 20 13:13:17 CET 2011 on sn-devel-104

diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 6b9f912e277954aca234330d2b7966d86c3a04f5..41d89815d0258194136cc055afc3e9b609ead6e1 100644 (file)
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -75,7 +75,7 @@ char *tldap_talloc_single_attribute(struct tldap_message *msg,
        size_t len;
 
        if (!tldap_get_single_valueblob(msg, attribute, &val)) {
-               return false;
+               return NULL;
        }
        if (!convert_string_talloc(mem_ctx, CH_UTF8, CH_UNIX,
                                   val.data, val.length,

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index d111d018e0fef78df78693fdf9bb4f30d97f1961..76ca0c0cf3936a9ad5d957872d787746d0cdb5da 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -413,7 +413,7 @@ char* kerberos_secrets_fetch_des_salt( void )
 
        if ( (key = des_salt_key()) == NULL ) {
                DEBUG(0,("kerberos_secrets_fetch_des_salt: failed to generate key!\n"));
-               return False;
+               return NULL;
        }
 
        salt = (char*)secrets_fetch( key, NULL );

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 58fb2e8e034b4884f36d7991118d59f7b482d2bc..4f98f5c5e92c305b57d0bfd1cf4f1346621e848b 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3037,7 +3037,7 @@ struct cli_state *get_ipc_connect_master_ip_bcast(TALLOC_CTX *ctx,
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(99, ("No master browsers responded: %s\n",
                           nt_errstr(status)));
-                return False;
+                return NULL;
         }
 
        for (i = 0; i < count; i++) {

diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 618a570c4e05a20d89ef3886d8570663f3accdc0..b04cf0a2197382c32e798f3c7e7489e4d94c4ab2 100644 (file)
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -205,7 +205,7 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const struct do
        if (!netsamlogon_cache_init()) {
                DEBUG(0,("netsamlogon_cache_get: cannot open %s for write!\n",
                        NETSAMLOGON_TDB));
-               return false;
+               return NULL;
        }
 
        /* Prepare key as DOMAIN-SID/USER-RID string */

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 6d2beccfef1badf5e9ea8ce4530af9c535b87e18..9be8ff8fb9520a689db421adc50df325ceb24c86 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -522,7 +522,7 @@ static REGF_HBIN* read_hbin_block( REGF_FILE *file, off_t offset )
        /* remember that the record_size is in the 4 bytes preceeding the record itself */
 
        if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE-sizeof(uint32) ) )
-               return False;
+               return NULL;
 
        record_size = 0;
        header = 0;
@@ -545,12 +545,12 @@ static REGF_HBIN* read_hbin_block( REGF_FILE *file, off_t offset )
                }
 
                if ( !prs_set_offset( &hbin->ps, curr_off) )
-                       return False;
+                       return NULL;
 
                if ( !prs_uint32( "rec_size", &hbin->ps, 0, &record_size ) )
-                       return False;
+                       return NULL;
                if ( !prs_uint32( "header", &hbin->ps, 0, &header ) )
-                       return False;
+                       return NULL;
                
                SMB_ASSERT( record_size != 0 );
 
@@ -574,7 +574,7 @@ static REGF_HBIN* read_hbin_block( REGF_FILE *file, off_t offset )
        DEBUG(10,("read_hbin_block: free space offset == 0x%x\n", hbin->free_off));
 
        if ( !prs_set_offset( &hbin->ps, file->data_offset+HBIN_HDR_SIZE )  )
-               return False;
+               return NULL;
        
        return hbin;
 }
@@ -1599,7 +1599,7 @@ done:
           for the record */
 
        if ( !prs_uint32("allocated_size", &hbin->ps, 0, &size) )
-               return False;
+               return NULL;
 
        update_free_space( hbin, size );
        
@@ -1812,7 +1812,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
                TYPESAFE_QSORT(parent->subkeys.hashes, parent->subkey_index, hashrec_cmp);
 
                if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) )
-                       return False;
+                       return NULL;
        }
 
        /* write the security descriptor */
@@ -1964,11 +1964,11 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
        
        prs_set_offset( &nk->hbin->ps, nk->hbin_off );
        if ( !prs_nk_rec( "nk_rec", &nk->hbin->ps, 0, nk ) )
-               return False;
+               return NULL;
 
        if ( nk->num_values ) {
                if ( !hbin_prs_vk_records( "vk_records", vlist_hbin, 0, nk, file ) )
-                       return False;
+                       return NULL;
        }
 
 

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 63a7887f3e55e621f371b15bcbc04f4676edb5fd..d8e26f6912e458110dacc6e12839ea1da354ab47 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -201,7 +201,7 @@ static struct dptr_struct *dptr_get(struct smbd_server_connection *sconn,
                                              dptr->wcard, dptr->attr))) {
                                        DEBUG(4,("dptr_get: Failed to open %s (%s)\n",dptr->path,
                                                strerror(errno)));
-                                       return False;
+                                       return NULL;
                                }
                        }
                        DLIST_PROMOTE(sconn->searches.dirptrs,dptr);

diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 1f4fc2d0a215aa73d5aa72ed0da9fb30ac906b41..147f95adf35031c1d9f8e45a3f9c822e9d360059 100644 (file)
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -239,7 +239,7 @@ void *init_quota_handle(TALLOC_CTX *mem_ctx)
        SMB_NTQUOTA_HANDLE *qt_handle;
 
        if (!mem_ctx)
-               return False;
+               return NULL;
 
        qt_handle = talloc_zero(mem_ctx,SMB_NTQUOTA_HANDLE);
        if (qt_handle==NULL) {

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index c1f0d36fda75de906309aaa125fbbc92eb063cd1..ffe3f389685d7188d86735d2ce570d35b99ff7ed 100644 (file)
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -4603,7 +4603,7 @@ struct winbindd_tdc_domain * wcache_tdc_fetch_domain( TALLOC_CTX *ctx, const cha
        DEBUG(10,("wcache_tdc_fetch_domain: Searching for domain %s\n", name));
 
        if ( !init_wcache() ) {
-               return false;
+               return NULL;
        }
 
        /* fetch the list */
@@ -4653,7 +4653,7 @@ struct winbindd_tdc_domain*
                  sid_string_dbg(sid)));
 
        if (!init_wcache()) {
-               return false;
+               return NULL;
        }
 
        /* fetch the list */