diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-15 08:18:29 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-15 08:18:29 +0000 |
| commit | 02704f973347f05af5ebcb0d4a494a6102199536 (patch) | |
| tree | 9829826e5606439ccc7e0932c9a7dffe183cdb0c /source3 | |
| parent | f1d333ea35a4fed92e2d51aafa4e758f577e5cf1 (diff) | |
| download | samba-02704f973347f05af5ebcb0d4a494a6102199536.tar.gz samba-02704f973347f05af5ebcb0d4a494a6102199536.tar.bz2 samba-02704f973347f05af5ebcb0d4a494a6102199536.zip | |
Minor fixes.
- signed/unsigned
- quieten warning about assignment as truth value
- whitespace
Andrew Bartlett
(This used to be commit a13ce0df4b4a776fa635a1fb804dd00d195f58d0)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/rpc_lsa.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/trusts_util.c | 4 | ||||
| -rw-r--r-- | source3/smbd/ipc.c | 8 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index c091e73321..8e1368810f 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/include/rpc_lsa.h @@ -237,7 +237,7 @@ typedef struct r_lsa_query_sec_obj_info typedef struct lsa_query_info { POLICY_HND pol; /* policy handle */ - uint16 info_class; /* info class */ + uint16 info_class; /* info class */ } LSA_Q_QUERY_INFO; diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c index 055851f6b7..f7b2c2e3a6 100644 --- a/source3/libsmb/trusts_util.c +++ b/source3/libsmb/trusts_util.c @@ -152,9 +152,9 @@ BOOL is_trusted_domain(const char* dom_name) talloc_destroy(mem_ctx); return True; } - } + } } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)); - + /* * Query the trustdom_cache updated periodically. The only * way for domain member server. diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index c8bb0c2505..85e28f5d17 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -138,9 +138,9 @@ void send_trans_reply(char *outbuf, set_message(outbuf,10,1+this_ldata+this_lparam+align,False); copy_trans_params_and_data(outbuf, align, - rparam, tot_param_sent, this_lparam, - rdata, tot_data_sent, this_ldata); - + rparam, tot_param_sent, this_lparam, + rdata, tot_data_sent, this_ldata); + SSVAL(outbuf,smb_vwv3,this_lparam); SSVAL(outbuf,smb_vwv4,smb_offset(smb_buf(outbuf)+1,outbuf)); SSVAL(outbuf,smb_vwv5,tot_param_sent); @@ -410,7 +410,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int } if (suwcnt) { - int i; + unsigned int i; if((setup = (uint16 *)malloc(suwcnt*sizeof(uint16))) == NULL) { DEBUG(0,("reply_trans: setup malloc fail for %u bytes !\n", (unsigned int)(suwcnt * sizeof(uint16)))); SAFE_FREE(data); diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index ea31a92575..22b9d50ea1 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -155,7 +155,7 @@ retry: * If the username is of the form "name@realm", * extract the realm and convert to upper case. */ - if (realm = strchr(ads->auth.user_name, '@')) { + if ((realm = strchr(ads->auth.user_name, '@'))) { *realm++ = '\0'; ads->auth.realm = strdup(realm); strupper(ads->auth.realm); |