summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/tools/sss_groupadd.c15
-rw-r--r--server/tools/sss_groupdel.c2
-rw-r--r--server/tools/sss_useradd.c4
-rw-r--r--server/tools/sss_userdel.c2
4 files changed, 12 insertions, 11 deletions
diff --git a/server/tools/sss_groupadd.c b/server/tools/sss_groupadd.c
index 61f49c72..e36e220f 100644
--- a/server/tools/sss_groupadd.c
+++ b/server/tools/sss_groupadd.c
@@ -84,19 +84,13 @@ int main(int argc, const char **argv)
POPT_TABLEEND
};
- poptContext pc;
+ poptContext pc = NULL;
struct tools_ctx *ctx = NULL;
struct group_add_ctx *group_ctx = NULL;
int ret = EXIT_SUCCESS;
debug_prg_name = argv[0];
- group_ctx = talloc_zero(NULL, struct group_add_ctx);
- if (group_ctx == NULL) {
- DEBUG(0, ("Could not allocate memory for group_ctx context\n"));
- return ENOMEM;
- }
- group_ctx->ctx = ctx;
/* arguments processed, go on to actual work */
ret = setup_db(&ctx);
@@ -106,6 +100,13 @@ int main(int argc, const char **argv)
goto fini;
}
+ group_ctx = talloc_zero(NULL, struct group_add_ctx);
+ if (group_ctx == NULL) {
+ DEBUG(0, ("Could not allocate memory for group_ctx context\n"));
+ return ENOMEM;
+ }
+ group_ctx->ctx = ctx;
+
/* parse params */
pc = poptGetContext(NULL, argc, argv, long_options, 0);
poptSetOtherOptionHelp(pc, "GROUPNAME");
diff --git a/server/tools/sss_groupdel.c b/server/tools/sss_groupdel.c
index 1950aaef..1cbddf45 100644
--- a/server/tools/sss_groupdel.c
+++ b/server/tools/sss_groupdel.c
@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
struct tools_ctx *ctx = NULL;
- poptContext pc;
+ poptContext pc = NULL;
struct poptOption long_options[] = {
POPT_AUTOHELP
POPT_TABLEEND
diff --git a/server/tools/sss_useradd.c b/server/tools/sss_useradd.c
index 2cf7826e..98f83774 100644
--- a/server/tools/sss_useradd.c
+++ b/server/tools/sss_useradd.c
@@ -269,9 +269,9 @@ int main(int argc, const char **argv)
{ "groups", 'G', POPT_ARG_STRING, NULL, 0, "Groups", NULL },
POPT_TABLEEND
};
- poptContext pc;
+ poptContext pc = NULL;
struct user_add_ctx *user_ctx = NULL;
- struct tools_ctx *ctx;
+ struct tools_ctx *ctx = NULL;
char *groups;
int ret;
diff --git a/server/tools/sss_userdel.c b/server/tools/sss_userdel.c
index e0f6300e..1a56cf9d 100644
--- a/server/tools/sss_userdel.c
+++ b/server/tools/sss_userdel.c
@@ -80,7 +80,7 @@ int main(int argc, const char **argv)
struct tools_ctx *ctx = NULL;
- poptContext pc;
+ poptContext pc = NULL;
struct poptOption long_options[] = {
POPT_AUTOHELP
POPT_TABLEEND