Fix obvious compiler warnings.

Jeremy.
(This used to be commit 2a6d0c2481c3c34351e57c30a85004babdbf99b0)

diff --git a/source3/passdb/pdb_guest.c b/source3/passdb/pdb_guest.c
index 9bcdccc7e7b9ab516d16cab7dfc3e0485e5bd50e..f5cd3d996d2e7d161e705292f780464458a27d76 100644 (file)
--- a/source3/passdb/pdb_guest.c
+++ b/source3/passdb/pdb_guest.c
@@ -26,7 +26,6 @@
 
 static NTSTATUS guestsam_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *sam_account, const char *sname)
 {
-       NTSTATUS nt_status;
        const char *guest_account = lp_guestaccount();
 
        if (!sam_account || !sname) {

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index da3a163c1e63ac4d51865394fa55b52a0038de0f..b75238e971bbb1f9abb1bf31a34f1b94cec18041 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1599,7 +1599,6 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
                        acct_desc,
                        munged_dial,
                        workstations;
-       struct passwd   *pw;
        uint32          user_rid; 
        uint8           smblmpwd[LM_HASH_LEN],
                        smbntpwd[NT_HASH_LEN];

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 74437cba6f33a540dec307493cba636263ef68ee..93fa4e1886bb0137a8bfdcb97a92d25cf7e56e3b 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -99,7 +99,6 @@ static BOOL init_sam_from_buffer (struct tdbsam_privates *tdb_state,
        uint32          len = 0;
        uint32          lm_pw_len, nt_pw_len, hourslen;
        BOOL ret = True;
-       struct passwd *pw;
        uid_t uid = -1;
        gid_t gid = -1;
        

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 8c9e22966a5f1cf93902cf98da1434002b5ebfbf..fa7a10bb1a0666124994cb2bc2b66e1c4df337f9 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -3509,7 +3509,6 @@ NTSTATUS _samr_add_groupmem(pipes_struct *p, SAMR_Q_ADD_GROUPMEM *q_u, SAMR_R_AD
        struct group *grp;
        fstring grp_name;
        GROUP_MAP map;
-       uid_t uid;
        NTSTATUS ret;
        SAM_ACCOUNT *sam_user=NULL;
        BOOL check;

diff --git a/source3/sam/idmap_util.c b/source3/sam/idmap_util.c
index e0c492542b33c7b3dba946cbc47a3cb93a1a3c51..8c3a3788327d78d4ac3277ca33f4ada925667d8e 100644 (file)
--- a/source3/sam/idmap_util.c
+++ b/source3/sam/idmap_util.c
@@ -175,7 +175,6 @@ NTSTATUS uid_to_sid(DOM_SID *sid, uid_t uid)
 NTSTATUS gid_to_sid(DOM_SID *sid, gid_t gid)
 {
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-       GROUP_MAP map;
        unid_t id;
        int flags;
 
@@ -272,7 +271,6 @@ NTSTATUS sid_to_gid(const DOM_SID *sid, gid_t *gid)
 {
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
        BOOL fallback = False;
-       uint32 rid;
        unid_t id;
        int flags;
 

diff --git a/source3/smbd/vfs-wrap.c b/source3/smbd/vfs-wrap.c
index e170effd4e855f0301817e0df7caae60cda4e703..9f0995d398b0ea802e62b62986435d4fcfcc54a7 100644 (file)
--- a/source3/smbd/vfs-wrap.c
+++ b/source3/smbd/vfs-wrap.c
@@ -297,7 +297,6 @@ int vfswrap_chmod(vfs_handle_struct *handle, connection_struct *conn, const char
 int vfswrap_fchmod(vfs_handle_struct *handle, files_struct *fsp, int fd, mode_t mode)
 {
        int result;
-       struct vfs_ops *vfs_ops = &fsp->conn->vfs;
        
        START_PROFILE(syscall_fchmod);
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 1a50f9d27073ad95e3cab1bfeb2d21fd7cbaceca..626db96994e00cf5749346fdd152c6b0c62f0f7a 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -159,7 +159,7 @@ retry:
         * extract the realm and convert to upper case.
         * This is only used to establish the connection.
         */
-       if (cp = strchr(ads->auth.user_name, '@')) {
+       if ((cp = strchr(ads->auth.user_name, '@'))!=0) {
                *cp++ = '\0';
                ads->auth.realm = smb_xstrdup(cp);
                strupper(ads->auth.realm);

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 13f35e888068c5a67381f65ac62ad50ff972b403..9a45049bc5e6aa7ac44e33aa1d4fa398dfb2a23f 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -112,7 +112,6 @@ static int export_groups (struct pdb_context *in, struct pdb_context *out) {
 static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdstyle)
 {
        uid_t uid;
-       gid_t gid;
        time_t tmp;
 
        /* TODO: chaeck if entry is a user or a workstation */