summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/printing/printing.c4
-rw-r--r--source3/rpc_server/srv_samr_nt.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 26d4311770..7a68fa16be 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -235,7 +235,7 @@ void printing_end(void)
when asked for (and only when supported)
****************************************************************************/
-static struct printif *get_printer_fns_from_type( enum printing_types type )
+static struct printif *get_printer_fns_from_type( int type )
{
struct printif *printer_fns = &generic_printif;
@@ -1379,7 +1379,7 @@ static void print_queue_update(int snum, BOOL force)
size_t len = 0;
size_t newlen;
struct tdb_print_db *pdb;
- enum printing_types type;
+ int type;
struct printif *current_printif;
fstrcpy( sharename, lp_const_servicename(snum));
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 9e75dd6f7c..b96e160156 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -1977,7 +1977,7 @@ NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, S
DOM_GID *gids = NULL;
int num_groups = 0;
gid_t *unix_gids;
- int i, num_gids, num_sids;
+ int i, num_gids;
uint32 acc_granted;
BOOL ret;
NTSTATUS result;
@@ -2027,7 +2027,6 @@ NTSTATUS _samr_query_usergroups(pipes_struct *p, SAMR_Q_QUERY_USERGROUPS *q_u, S
}
sids = NULL;
- num_sids = 0;
become_root();
result = pdb_enum_group_memberships(pdb_get_username(sam_pass),
@@ -4119,7 +4118,6 @@ NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, S
DOM_SID dom_sid;
DOM_SID info_sid;
fstring name;
- struct group *grp;
struct samr_info *info;
uint32 acc_granted;
gid_t gid;
@@ -4166,7 +4164,7 @@ NTSTATUS _samr_create_dom_alias(pipes_struct *p, SAMR_Q_CREATE_DOM_ALIAS *q_u, S
return NT_STATUS_ACCESS_DENIED;
/* check if the group has been successfully created */
- if ((grp=getgrgid(gid)) == NULL)
+ if ( getgrgid(gid) == NULL )
return NT_STATUS_ACCESS_DENIED;
if ((info = get_samr_info_by_sid(&info_sid)) == NULL)