summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-02-10 10:59:18 +0100
committerMichael Adam <obnox@samba.org>2011-02-10 13:57:31 +0100
commit76ea4fd03a36985a5e45b5d92b585bfbd3aa53d7 (patch)
treefa7e4aa42a491c0a8fa0bd27c8090d0cfec49cd0 /nsswitch
parentad0a3185ce4d9918597d1de3decb9080b88277ef (diff)
downloadsamba-76ea4fd03a36985a5e45b5d92b585bfbd3aa53d7.tar.gz
samba-76ea4fd03a36985a5e45b5d92b585bfbd3aa53d7.tar.bz2
samba-76ea4fd03a36985a5e45b5d92b585bfbd3aa53d7.zip
Revert "nsswitch: remove unused code from wbinfo.c"
This reverts commit 3bdd2efff8d11448275965b464ac194a2ee0d3ae. Undo the library version bump.
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/wbinfo.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 1056fb33e9..a4b2a3c998 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -139,6 +139,31 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain,
return true;
}
+/* Parse string of "uid,sid" or "gid,sid" into separate int and string values.
+ * Return true if input was valid, false otherwise. */
+static bool parse_mapping_arg(char *arg, int *id, char **sid)
+{
+ char *tmp, *endptr;
+
+ if (!arg || !*arg)
+ return false;
+
+ tmp = strtok(arg, ",");
+ *sid = strtok(NULL, ",");
+
+ if (!tmp || !*tmp || !*sid || !**sid)
+ return false;
+
+ /* Because atoi() can return 0 on invalid input, which would be a valid
+ * UID/GID we must use strtoul() and do error checking */
+ *id = strtoul(tmp, &endptr, 10);
+
+ if (endptr[0] != '\0')
+ return false;
+
+ return true;
+}
+
/* pull pwent info for a given user */
static bool wbinfo_get_userinfo(char *user)
@@ -1837,8 +1862,10 @@ int main(int argc, char **argv, char **envp)
TALLOC_CTX *frame = talloc_stackframe();
poptContext pc;
static char *string_arg;
+ char *string_subarg = NULL;
static char *opt_domain_name;
static int int_arg;
+ int int_subarg = -1;
int result = 1;
bool verbose = false;
bool use_ntlmv2 = false;