diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-25 19:47:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:13 -0500 |
| commit | 5993ddf240a945ae770754454a201c3f7a0ad7d8 (patch) | |
| tree | f8f80827d86c094944175774f96212939a3bd14e /source3/smbd/negprot.c | |
| parent | d61c180e4903012a868c36e19473ccff5545976c (diff) | |
| download | samba-5993ddf240a945ae770754454a201c3f7a0ad7d8.tar.gz samba-5993ddf240a945ae770754454a201c3f7a0ad7d8.tar.bz2 samba-5993ddf240a945ae770754454a201c3f7a0ad7d8.zip | |
r24659: Some formatting changes helping to minimize the 3_2_0 diff
(This used to be commit c5caea43af154671448df82881efe09a5c982386)
Diffstat (limited to 'source3/smbd/negprot.c')
| -rw-r--r-- | source3/smbd/negprot.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 935d25fab3..4437f0bd3f 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -229,10 +229,9 @@ static DATA_BLOB negprot_spnego(void) char *host_princ_s = NULL; name_to_fqdn(myname, global_myname()); strlower_m(myname); - asprintf(&host_princ_s, "cifs/%s@%s", myname, lp_realm()); - if (host_princ_s == NULL) { - blob = data_blob_null; - return blob; + if (asprintf(&host_princ_s, "cifs/%s@%s", myname, lp_realm()) + == -1) { + return data_blob_null; } blob = spnego_gen_negTokenInit(guid, OIDs_krb5, host_princ_s); SAFE_FREE(host_princ_s); @@ -540,7 +539,7 @@ void reply_negprot(connection_struct *conn, struct smb_request *req) num_cliprotos = 0; cliprotos = NULL; - while (p < (smb_buf(req->inbuf) + bcc)) { + while (p < (smb_buf(req->inbuf) + bcc)) { char **tmp; |