[SCM] Samba Shared Repository - branch master updated - 94df767f21003507f01b9b08d7c52b5b8819977f

[Jeremy Allison]

The branch, master has been updated
       via  94df767f21003507f01b9b08d7c52b5b8819977f (commit)
      from  b143938b8afaa7c7759e09228cc0d92ff97121d0 (commit)

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


- Log -----------------------------------------------------------------
commit 94df767f21003507f01b9b08d7c52b5b8819977f
Author: Jeremy Allison <jer...@jeremy-desktop.(none)>
Date:   Tue Dec 23 11:45:26 2008 -0800

    More asprintf warning fixes.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/libads/krb5_setpw.c  |   27 ++++++++++++++++++---------
 source3/passdb/login_cache.c |    7 +++----
 2 files changed, 21 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 04ee6ee..5032ffd 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -605,7 +605,13 @@ ADS_STATUS ads_krb5_set_password(const char *kdc_host, 
const char *princ,
        }
        realm++;
 
-       asprintf(&princ_name, "kadmin/chang...@%s", realm);
+       if (asprintf(&princ_name, "kadmin/chang...@%s", realm) == -1) {
+               krb5_cc_close(context, ccache);
+                krb5_free_context(context);
+               DEBUG(1,("asprintf failed\n"));
+               return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+       }
+
        ret = smb_krb5_parse_name(context, princ_name, &creds.server);
        if (ret) {
                krb5_cc_close(context, ccache);
@@ -736,8 +742,13 @@ static ADS_STATUS ads_krb5_chg_password(const char 
*kdc_host,
     krb5_get_init_creds_opt_set_proxiable(&opts, 0);
 
     /* We have to obtain an INITIAL changepw ticket for changing password */
-    asprintf(&chpw_princ, "kadmin/chang...@%s",
-                               (char *) krb5_princ_realm(context, princ));
+    if (asprintf(&chpw_princ, "kadmin/chang...@%s",
+                               (char *) krb5_princ_realm(context, princ)) == 
-1) {
+       krb5_free_context(context);
+       DEBUG(1,("ads_krb5_chg_password: asprintf fail\n"));
+       return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+    }
+
     password = SMB_STRDUP(oldpw);
     ret = krb5_get_init_creds_password(context, &creds, princ, password,
                                           kerb_prompter, NULL, 
@@ -807,16 +818,14 @@ ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads,
          as otherwise the server might end up setting the password for a user
          instead
         */
-       asprintf(&principal, "%...@%s", machine_account, ads->config.realm);
+       if (asprintf(&principal, "%...@%s", machine_account, ads->config.realm) 
< 0) {
+               return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+       }
        
        status = ads_krb5_set_password(ads->auth.kdc_server, principal, 
                                       password, ads->auth.time_offset);
        
-       free(principal);
-
+       SAFE_FREE(principal);
        return status;
 }
-
-
-
 #endif
diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index 8222f77..4e14293 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -35,14 +35,13 @@ bool login_cache_init(void)
        /* skip file open if it's already opened */
        if (cache) return True;
 
-       asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE);
-       if (cache_fname)
-               DEBUG(5, ("Opening cache file at %s\n", cache_fname));
-       else {
+       if (asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE) == 
-1) {
                DEBUG(0, ("Filename allocation failed.\n"));
                return False;
        }
 
+       DEBUG(5, ("Opening cache file at %s\n", cache_fname));
+
        cache = tdb_open_log(cache_fname, 0, TDB_DEFAULT,
                             O_RDWR|O_CREAT, 0644);
 


-- 
Samba Shared Repository