*/
#include "includes.h"
-#include "popt_common.h"
#include "winbind_client.h"
#include "libwbclient/wbclient.h"
-#include "lib/popt/popt.h"
#include "../libcli/auth/libcli_auth.h"
-#if (_SAMBA_BUILD_) >= 4
#include "lib/cmdline/popt_common.h"
-#endif
+#include "lib/afs/afs_settoken.h"
#ifdef DBGC_CLASS
#undef DBGC_CLASS
if (!p) {
/* Maybe it was a UPN? */
- if ((p = strchr(domuser, '@')) != NULL) {
+ p = strchr(domuser, '@');
+ if (p != NULL) {
fstrcpy(domain, "");
fstrcpy(user, domuser);
return true;
fstrcpy(user, p+1);
fstrcpy(domain, domuser);
domain[PTR_DIFF(p, domuser)] = 0;
- strupper_m(domain);
return true;
}
static bool parse_mapping_arg(char *arg, int *id, char **sid)
{
char *tmp, *endptr;
+ int error = 0;
if (!arg || !*arg)
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);
+ *id = strtoul_err(tmp, &endptr, 10, &error);
- if (endptr[0] != '\0')
+ if (endptr[0] != '\0' || error != 0)
return false;
return true;
pwd->pw_dir,
pwd->pw_shell);
+ wbcFreeMemory(pwd);
+
return true;
}
pwd->pw_dir,
pwd->pw_shell);
+ wbcFreeMemory(pwd);
+
return true;
}
pwd->pw_dir,
pwd->pw_shell);
+ wbcFreeMemory(pwd);
+
return true;
}
}
for (i = 0; i < num_sids; i++) {
- char *str = NULL;
- wbc_status = wbcSidToString(&sids[i], &str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: "
- "%s\n", wbcErrorString(wbc_status));
- wbcFreeMemory(sids);
- return false;
- }
+ char str[WBC_SID_STRING_BUFLEN];
+ wbcSidToStringBuf(&sids[i], str, sizeof(str));
d_printf("%s\n", str);
- wbcFreeMemory(str);
}
wbcFreeMemory(sids);
wbc_status = wbcStringToSid(user_sid_str, &user_sid);
if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: %s\n",
+ d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
wbcErrorString(wbc_status));
return false;
}
}
for (i = 0; i < num_sids; i++) {
- char *str = NULL;
- wbc_status = wbcSidToString(&sids[i], &str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: "
- "%s\n", wbcErrorString(wbc_status));
- wbcFreeMemory(sids);
- return false;
- }
+ char str[WBC_SID_STRING_BUFLEN];
+ wbcSidToStringBuf(&sids[i], str, sizeof(str));
d_printf("%s\n", str);
- wbcFreeMemory(str);
}
wbcFreeMemory(sids);
struct wbcDomainSid user_sid;
uint32_t *alias_rids = NULL;
uint32_t num_alias_rids;
- char *domain_sid_str = NULL;
+ char domain_sid_str[WBC_SID_STRING_BUFLEN];
/* Send request */
if ((domain == NULL) || (strequal(domain, ".")) ||
goto done;
}
- wbc_status = wbcSidToString(&dinfo->sid, &domain_sid_str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- goto done;
- }
+ wbcSidToStringBuf(&dinfo->sid, domain_sid_str, sizeof(domain_sid_str));
for (i = 0; i < num_alias_rids; i++) {
d_printf("%s-%d\n", domain_sid_str, alias_rids[i]);
wbcFreeMemory(alias_rids);
done:
- if (domain_sid_str) {
- wbcFreeMemory(domain_sid_str);
- }
- if (dinfo) {
- wbcFreeMemory(dinfo);
- }
+ wbcFreeMemory(dinfo);
return (WBC_ERR_SUCCESS == wbc_status);
}
}
if (print_all) {
- d_printf("%-16s%-24s%-12s%-12s%-5s%-5s\n",
+ d_printf("%-16s%-65s%-12s%-12s%-5s%-5s\n",
"Domain Name", "DNS Domain", "Trust Type",
"Transitive", "In", "Out");
}
continue;
}
- d_printf("%-24s", domain_list[i].dns_name);
+ d_printf("%-65s", domain_list[i].dns_name);
switch(domain_list[i].trust_type) {
case WBC_DOMINFO_TRUSTTYPE_NONE:
- d_printf("None ");
+ if (domain_list[i].trust_routing != NULL) {
+ d_printf("%s\n", domain_list[i].trust_routing);
+ } else {
+ d_printf("None\n");
+ }
+ continue;
+ case WBC_DOMINFO_TRUSTTYPE_LOCAL:
+ d_printf("Local\n");
+ continue;
+ case WBC_DOMINFO_TRUSTTYPE_RWDC:
+ d_printf("RWDC\n");
+ continue;
+ case WBC_DOMINFO_TRUSTTYPE_RODC:
+ d_printf("RODC\n");
+ continue;
+ case WBC_DOMINFO_TRUSTTYPE_PDC:
+ d_printf("PDC\n");
+ continue;
+ case WBC_DOMINFO_TRUSTTYPE_WKSTA:
+ d_printf("Workstation ");
break;
case WBC_DOMINFO_TRUSTTYPE_FOREST:
d_printf("Forest ");
d_printf("\n");
}
+ wbcFreeMemory(domain_list);
+
return true;
}
d_printf("%s : %s\n",
domain_list[i].short_name,
- is_offline ? "offline" : "online" );
+ is_offline ? "no active connection" : "active connection" );
}
+ wbcFreeMemory(domain_list);
+
return true;
}
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcDomainInfo *dinfo = NULL;
- char *sid_str = NULL;
+ char sid_str[WBC_SID_STRING_BUFLEN];
if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')){
domain = get_winbind_domain();
return false;
}
- wbc_status = wbcSidToString(&dinfo->sid, &sid_str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: %s\n",
- wbcErrorString(wbc_status));
- wbcFreeMemory(dinfo);
- return false;
- }
+ wbcSidToStringBuf(&dinfo->sid, sid_str, sizeof(sid_str));
/* Display response */
(dinfo->domain_flags & WBC_DOMINFO_DOMAIN_PRIMARY) ?
"Yes" : "No");
- wbcFreeMemory(sid_str);
wbcFreeMemory(dinfo);
return true;
/* Send request */
- if (winbindd_request_response(WINBINDD_GETDCNAME, &request,
+ if (winbindd_request_response(NULL, WINBINDD_GETDCNAME, &request,
&response) != NSS_STATUS_SUCCESS) {
d_fprintf(stderr, "Could not get dc name for %s\n",domain_name);
return false;
d_printf("%s\n", dc_info->dc_site_name);
d_printf("%s\n", dc_info->client_site_name);
+ wbcFreeMemory(str);
+ wbcFreeMemory(dc_info);
+
return true;
}
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
if (wbc_status == WBC_ERR_AUTH_ERROR) {
- d_fprintf(stderr, "error code was %s (0x%x)\n",
- error->nt_string, error->nt_status);
+ d_fprintf(stderr, "wbcCheckTrustCredentials(%s): error code was %s (0x%x)\n",
+ domain_name, error->nt_string, error->nt_status);
wbcFreeMemory(error);
}
if (!WBC_ERROR_IS_OK(wbc_status)) {
return true;
}
+/* Find the currently connected DCs */
+
+static bool wbinfo_dc_info(const char *domain_name)
+{
+ wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+ size_t i, num_dcs;
+ const char **dc_names, **dc_ips;
+
+ wbc_status = wbcDcInfo(domain_name, &num_dcs,
+ &dc_names, &dc_ips);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ printf("Could not find dc info %s\n",
+ domain_name ? domain_name : "our domain");
+ return false;
+ }
+
+ for (i=0; i<num_dcs; i++) {
+ printf("%s (%s)\n", dc_names[i], dc_ips[i]);
+ }
+ wbcFreeMemory(dc_names);
+ wbcFreeMemory(dc_ips);
+
+ return true;
+}
+
/* Change trust account password */
static bool wbinfo_change_secret(const char *domain)
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
if (wbc_status == WBC_ERR_AUTH_ERROR) {
- d_fprintf(stderr, "error code was %s (0x%x)\n",
- error->nt_string, error->nt_status);
+ d_fprintf(stderr, "wbcChangeTrustCredentials(%s): error code was %s (0x%x)\n",
+ domain_name, error->nt_string, error->nt_status);
wbcFreeMemory(error);
}
if (!WBC_ERROR_IS_OK(wbc_status)) {
/* Check DC connection */
-static bool wbinfo_ping_dc(void)
+static bool wbinfo_ping_dc(const char *domain)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcAuthErrorInfo *error = NULL;
+ char *dcname = NULL;
- wbc_status = wbcPingDc(NULL, &error);
+ const char *domain_name;
- d_printf("checking the NETLOGON dc connection %s\n",
+ if (domain) {
+ domain_name = domain;
+ } else {
+ domain_name = get_winbind_domain();
+ }
+
+ wbc_status = wbcPingDc2(domain_name, &error, &dcname);
+
+ d_printf("checking the NETLOGON for domain[%s] dc connection to \"%s\" %s\n",
+ domain_name ? domain_name : "",
+ dcname ? dcname : "",
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
+ wbcFreeMemory(dcname);
if (wbc_status == WBC_ERR_AUTH_ERROR) {
- d_fprintf(stderr, "error code was %s (0x%x)\n",
- error->nt_string, error->nt_status);
+ d_fprintf(stderr, "wbcPingDc2(%s): error code was %s (0x%x)\n",
+ domain_name, error->nt_string, error->nt_status);
wbcFreeMemory(error);
+ return false;
}
if (!WBC_ERROR_IS_OK(wbc_status)) {
d_fprintf(stderr, "failed to call wbcPingDc: %s\n",
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcDomainSid sid;
- char *sid_str = NULL;
+ char sid_str[WBC_SID_STRING_BUFLEN];
/* Send request */
return false;
}
- wbc_status = wbcSidToString(&sid, &sid_str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
+ wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
/* Display response */
d_printf("%s\n", sid_str);
- wbcFreeMemory(sid_str);
-
return true;
}
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcDomainSid sid;
- char *sid_str = NULL;
+ char sid_str[WBC_SID_STRING_BUFLEN];
/* Send request */
return false;
}
- wbc_status = wbcSidToString(&sid, &sid_str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
+ wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
/* Display response */
d_printf("%s\n", sid_str);
- wbcFreeMemory(sid_str);
-
return true;
}
return true;
}
+static bool wbinfo_sids_to_unix_ids(const char *arg)
+{
+ char sidstr[WBC_SID_STRING_BUFLEN];
+ struct wbcDomainSid *sids;
+ struct wbcUnixId *unix_ids;
+ int i, num_sids;
+ const char *p;
+ wbcErr wbc_status;
+
+
+ num_sids = 0;
+ sids = NULL;
+ p = arg;
+
+ while (next_token(&p, sidstr, LIST_SEP, sizeof(sidstr))) {
+ sids = talloc_realloc(talloc_tos(), sids, struct wbcDomainSid,
+ num_sids+1);
+ if (sids == NULL) {
+ d_fprintf(stderr, "talloc failed\n");
+ return false;
+ }
+ wbc_status = wbcStringToSid(sidstr, &sids[num_sids]);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ d_fprintf(stderr, "wbcSidToString(%s) failed: %s\n",
+ sidstr, wbcErrorString(wbc_status));
+ TALLOC_FREE(sids);
+ return false;
+ }
+ num_sids += 1;
+ }
+
+ unix_ids = talloc_array(talloc_tos(), struct wbcUnixId, num_sids);
+ if (unix_ids == NULL) {
+ TALLOC_FREE(sids);
+ return false;
+ }
+
+ wbc_status = wbcSidsToUnixIds(sids, num_sids, unix_ids);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ d_fprintf(stderr, "wbcSidsToUnixIds failed: %s\n",
+ wbcErrorString(wbc_status));
+ TALLOC_FREE(sids);
+ return false;
+ }
+
+ for (i=0; i<num_sids; i++) {
+
+ wbcSidToStringBuf(&sids[i], sidstr, sizeof(sidstr));
+
+ switch(unix_ids[i].type) {
+ case WBC_ID_TYPE_UID:
+ d_printf("%s -> uid %d\n", sidstr, unix_ids[i].id.uid);
+ break;
+ case WBC_ID_TYPE_GID:
+ d_printf("%s -> gid %d\n", sidstr, unix_ids[i].id.gid);
+ break;
+ case WBC_ID_TYPE_BOTH:
+ d_printf("%s -> uid/gid %d\n", sidstr, unix_ids[i].id.uid);
+ break;
+ default:
+ d_printf("%s -> unmapped\n", sidstr);
+ break;
+ }
+ }
+
+ TALLOC_FREE(sids);
+ TALLOC_FREE(unix_ids);
+
+ return true;
+}
+
+static bool wbinfo_xids_to_sids(const char *arg)
+{
+ fstring idstr;
+ struct wbcUnixId *xids = NULL;
+ struct wbcDomainSid *sids;
+ wbcErr wbc_status;
+ int num_xids = 0;
+ const char *p;
+ int i;
+
+ p = arg;
+
+ while (next_token(&p, idstr, LIST_SEP, sizeof(idstr))) {
+ xids = talloc_realloc(talloc_tos(), xids, struct wbcUnixId,
+ num_xids+1);
+ if (xids == NULL) {
+ d_fprintf(stderr, "talloc failed\n");
+ return false;
+ }
+
+ switch (idstr[0]) {
+ case 'u':
+ xids[num_xids] = (struct wbcUnixId) {
+ .type = WBC_ID_TYPE_UID,
+ .id.uid = atoi(&idstr[1])
+ };
+ break;
+ case 'g':
+ xids[num_xids] = (struct wbcUnixId) {
+ .type = WBC_ID_TYPE_GID,
+ .id.gid = atoi(&idstr[1])
+ };
+ break;
+ default:
+ d_fprintf(stderr, "%s is an invalid id\n", idstr);
+ TALLOC_FREE(xids);
+ return false;
+ }
+ num_xids += 1;
+ }
+
+ sids = talloc_array(talloc_tos(), struct wbcDomainSid, num_xids);
+ if (sids == NULL) {
+ d_fprintf(stderr, "talloc failed\n");
+ TALLOC_FREE(xids);
+ return false;
+ }
+
+ wbc_status = wbcUnixIdsToSids(xids, num_xids, sids);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ d_fprintf(stderr, "wbcUnixIdsToSids failed: %s\n",
+ wbcErrorString(wbc_status));
+ TALLOC_FREE(sids);
+ TALLOC_FREE(xids);
+ return false;
+ }
+
+ for (i=0; i<num_xids; i++) {
+ char str[WBC_SID_STRING_BUFLEN];
+ struct wbcDomainSid null_sid = { 0 };
+
+ if (memcmp(&null_sid, &sids[i], sizeof(struct wbcDomainSid)) == 0) {
+ d_printf("NOT MAPPED\n");
+ continue;
+ }
+ wbcSidToStringBuf(&sids[i], str, sizeof(str));
+ d_printf("%s\n", str);
+ }
+
+ return true;
+}
+
static bool wbinfo_allocate_uid(void)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
/* Display response */
- d_printf("%s%c%s %d\n",
- domain, winbind_separator(), name, type);
+ if (type == WBC_SID_NAME_DOMAIN) {
+ d_printf("%s %d\n", domain, type);
+ } else {
+ d_printf("%s%c%s %d\n",
+ domain, winbind_separator(), name, type);
+ }
+
+ wbcFreeMemory(domain);
+ wbcFreeMemory(name);
return true;
}
d_printf("%s%c%s %d\n",
domain, winbind_separator(), name, type);
+ wbcFreeMemory(domain);
+ wbcFreeMemory(name);
+
return true;
}
p = arg;
while (next_token_talloc(mem_ctx, &p, &ridstr, " ,\n")) {
- uint32_t rid = strtoul(ridstr, NULL, 10);
+ int error = 0;
+ uint32_t rid;
+
+ rid = strtoul_err(ridstr, NULL, 10, &error);
+ if (error != 0) {
+ d_printf("failed to convert rid\n");
+ goto done;
+ }
rids = talloc_realloc(mem_ctx, rids, uint32_t, num_rids + 1);
if (rids == NULL) {
d_printf("talloc_realloc failed\n");
}
wbc_status = wbcLookupRids(&dinfo->sid, num_rids, rids,
- (const char **)&domain_name, &names, &types);
+ &p, &names, &types);
if (!WBC_ERROR_IS_OK(wbc_status)) {
d_printf("winbind_lookup_rids failed: %s\n",
wbcErrorString(wbc_status));
goto done;
}
+ domain_name = discard_const_p(char, p);
d_printf("Domain: %s\n", domain_name);
for (i=0; i<num_rids; i++) {
ret = true;
done:
- if (dinfo) {
- wbcFreeMemory(dinfo);
- }
- if (domain_name) {
- wbcFreeMemory(domain_name);
+ wbcFreeMemory(dinfo);
+ wbcFreeMemory(domain_name);
+ wbcFreeMemory(names);
+ wbcFreeMemory(types);
+ TALLOC_FREE(mem_ctx);
+ return ret;
+}
+
+static bool wbinfo_lookup_sids(const char *arg)
+{
+ char sidstr[WBC_SID_STRING_BUFLEN];
+ struct wbcDomainSid *sids;
+ struct wbcDomainInfo *domains;
+ struct wbcTranslatedName *names;
+ int num_domains;
+ int i, num_sids;
+ const char *p;
+ wbcErr wbc_status;
+
+
+ num_sids = 0;
+ sids = NULL;
+ p = arg;
+
+ while (next_token(&p, sidstr, LIST_SEP, sizeof(sidstr))) {
+ sids = talloc_realloc(talloc_tos(), sids, struct wbcDomainSid,
+ num_sids+1);
+ if (sids == NULL) {
+ d_fprintf(stderr, "talloc failed\n");
+ return false;
+ }
+ wbc_status = wbcStringToSid(sidstr, &sids[num_sids]);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ d_fprintf(stderr, "wbcSidToString(%s) failed: %s\n",
+ sidstr, wbcErrorString(wbc_status));
+ TALLOC_FREE(sids);
+ return false;
+ }
+ num_sids += 1;
}
- if (names) {
- wbcFreeMemory(names);
+
+ wbc_status = wbcLookupSids(sids, num_sids, &domains, &num_domains,
+ &names);
+ if (!WBC_ERROR_IS_OK(wbc_status)) {
+ d_fprintf(stderr, "wbcLookupSids failed: %s\n",
+ wbcErrorString(wbc_status));
+ TALLOC_FREE(sids);
+ return false;
}
- if (types) {
- wbcFreeMemory(types);
+
+ for (i=0; i<num_sids; i++) {
+ const char *domain = NULL;
+
+ wbcSidToStringBuf(&sids[i], sidstr, sizeof(sidstr));
+
+ if (names[i].domain_index >= num_domains) {
+ domain = "<none>";
+ } else if (names[i].domain_index < 0) {
+ domain = "<none>";
+ } else {
+ domain = domains[names[i].domain_index].short_name;
+ }
+
+ if (names[i].type == WBC_SID_NAME_DOMAIN) {
+ d_printf("%s -> %s %d\n", sidstr,
+ domain,
+ names[i].type);
+ } else {
+ d_printf("%s -> %s%c%s %d\n", sidstr,
+ domain,
+ winbind_separator(),
+ names[i].name, names[i].type);
+ }
}
- TALLOC_FREE(mem_ctx);
- return ret;
+ wbcFreeMemory(names);
+ wbcFreeMemory(domains);
+ return true;
}
/* Convert string to sid */
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcDomainSid sid;
- char *sid_str;
+ char sid_str[WBC_SID_STRING_BUFLEN];
enum wbcSidType type;
fstring domain_name;
fstring account_name;
return false;
}
- wbc_status = wbcSidToString(&sid, &sid_str);
- if (!WBC_ERROR_IS_OK(wbc_status)) {
- d_fprintf(stderr, "failed to call wbcSidToString: %s\n",
- wbcErrorString(wbc_status));
- return false;
- }
+ wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
/* Display response */
d_printf("%s %s (%d)\n", sid_str, wbcSidTypeString(type), type);
- wbcFreeMemory(sid_str);
-
return true;
}
const char *username)
{
char *prompt;
- const char *ret = NULL;
+ char buf[1024] = {0};
+ int rc;
prompt = talloc_asprintf(mem_ctx, "Enter %s's ", username);
if (!prompt) {
return NULL;
}
- ret = getpass(prompt);
+ rc = samba_getpass(prompt, buf, sizeof(buf), false, false);
TALLOC_FREE(prompt);
+ if (rc < 0) {
+ return NULL;
+ }
- return talloc_strdup(mem_ctx, ret);
+ return talloc_strdup(mem_ctx, buf);
}
/* Authenticate a user with a plaintext password */
if (error) {
d_fprintf(stderr,
- "error code was %s (0x%x)\nerror message was: %s\n",
- error->nt_string,
+ "wbcLogonUser(%s): error code was %s (0x%x)\n"
+ "error message was: %s\n",
+ params.username, error->nt_string,
error->nt_status,
error->display_string);
}
if (use_ntlmv2) {
DATA_BLOB server_chal;
DATA_BLOB names_blob;
+ const char *netbios_name = NULL;
+ const char *domain = NULL;
+
+ netbios_name = get_winbind_netbios_name(),
+ domain = get_winbind_domain();
+ if (domain == NULL) {
+ d_fprintf(stderr, "Failed to get domain from winbindd\n");
+ return false;
+ }
server_chal = data_blob(params.password.response.challenge, 8);
/* Pretend this is a login to 'us', for blob purposes */
names_blob = NTLMv2_generate_names_blob(NULL,
- get_winbind_netbios_name(),
- get_winbind_domain());
+ netbios_name,
+ domain);
- if (!SMBNTLMv2encrypt(NULL, name_user, name_domain, pass,
+ if (pass != NULL &&
+ !SMBNTLMv2encrypt(NULL, name_user, name_domain, pass,
&server_chal,
&names_blob,
&lm, &nt, NULL, NULL)) {
if (wbc_status == WBC_ERR_AUTH_ERROR) {
d_fprintf(stderr,
- "error code was %s (0x%x)\nerror message was: %s\n",
+ "wbcAuthenticateUserEx(%s%c%s): error code was "
+ "%s (0x%x, authoritative=%"PRIu8")\n"
+ "error message was: %s\n",
+ name_domain,
+ winbind_separator(),
+ name_user,
err->nt_string,
err->nt_status,
+ err->authoritative,
err->display_string);
wbcFreeMemory(err);
} else if (WBC_ERROR_IS_OK(wbc_status)) {
/* Authenticate a user with a plaintext password */
-static bool wbinfo_pam_logon(char *username)
+static bool wbinfo_pam_logon(char *username, bool verbose)
{
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
struct wbcLogonUserParams params;
- struct wbcAuthErrorInfo *error;
+ struct wbcLogonUserInfo *info = NULL;
+ struct wbcAuthErrorInfo *error = NULL;
char *s = NULL;
char *p = NULL;
TALLOC_CTX *frame = talloc_tos();
return false;
}
- wbc_status = wbcLogonUser(¶ms, NULL, &error, NULL);
+ wbc_status = wbcLogonUser(¶ms, &info, &error, NULL);
+
+ if (verbose && (info != NULL)) {
+ struct wbcAuthUserInfo *i = info->info;
+ uint32_t j;
+
+ if (i->account_name != NULL) {
+ d_printf("account_name: %s\n", i->account_name);
+ }
+ if (i->user_principal != NULL) {
+ d_printf("user_principal: %s\n", i->user_principal);
+ }
+ if (i->full_name != NULL) {
+ d_printf("full_name: %s\n", i->full_name);
+ }
+ if (i->domain_name != NULL) {
+ d_printf("domain_name: %s\n", i->domain_name);
+ }
+ if (i->dns_domain_name != NULL) {
+ d_printf("dns_domain_name: %s\n", i->dns_domain_name);
+ }
+ if (i->logon_server != NULL) {
+ d_printf("logon_server: %s\n", i->logon_server);
+ }
+ if (i->logon_script != NULL) {
+ d_printf("logon_script: %s\n", i->logon_script);
+ }
+ if (i->profile_path != NULL) {
+ d_printf("profile_path: %s\n", i->profile_path);
+ }
+ if (i->home_directory != NULL) {
+ d_printf("home_directory: %s\n", i->home_directory);
+ }
+ if (i->home_drive != NULL) {
+ d_printf("home_drive: %s\n", i->home_drive);
+ }
+
+ d_printf("sids:");
+
+ for (j=0; j<i->num_sids; j++) {
+ char buf[WBC_SID_STRING_BUFLEN];
+ wbcSidToStringBuf(&i->sids[j].sid, buf, sizeof(buf));
+ d_printf(" %s", buf);
+ }
+ d_printf("\n");
+
+ wbcFreeMemory(info);
+ info = NULL;
+ }
wbcFreeMemory(params.blobs);
d_printf("plaintext password authentication %s\n",
WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
- if (!WBC_ERROR_IS_OK(wbc_status)) {
+ if (!WBC_ERROR_IS_OK(wbc_status) && (error != NULL)) {
d_fprintf(stderr,
- "error code was %s (0x%x)\nerror message was: %s\n",
+ "wbcLogonUser(%s): error code was %s (0x%x)\n"
+ "error message was: %s\n",
+ params.username,
error->nt_string,
(int)error->nt_status,
error->display_string);
wbcFreeMemory(error);
- return false;
}
- return true;
+ return WBC_ERROR_IS_OK(wbc_status);
}
/* Save creds with winbind */
*p = '%';
} else {
fstrcpy(request.data.auth.user, username);
- fstrcpy(request.data.auth.pass, getpass("Password: "));
+ (void) samba_getpass("Password: ",
+ request.data.auth.pass,
+ sizeof(request.data.auth.pass),
+ false, false);
}
request.flags |= WBFLAG_PAM_AFS_TOKEN;
- result = winbindd_request_response(WINBINDD_PAM_AUTH, &request,
+ result = winbindd_request_response(NULL, WINBINDD_PAM_AUTH, &request,
&response);
/* Display response */
/* Send request to winbind daemon */
- /* '.' is the special sign for our own domain */
- if (domain && strcmp(domain, ".") == 0) {
+ if (domain == NULL) {
domain = get_winbind_domain();
+ } else {
+ /* '.' is the special sign for our own domain */
+ if ((domain[0] == '\0') || strcmp(domain, ".") == 0) {
+ domain = get_winbind_domain();
+ /* '*' is the special sign for all domains */
+ } else if (strcmp(domain, "*") == 0) {
+ domain = NULL;
+ }
}
wbc_status = wbcListUsers(domain, &num_users, &users);
/* Send request to winbind daemon */
- /* '.' is the special sign for our own domain */
- if (domain && strcmp(domain, ".") == 0) {
+ if (domain == NULL) {
domain = get_winbind_domain();
+ } else {
+ /* '.' is the special sign for our own domain */
+ if ((domain[0] == '\0') || strcmp(domain, ".") == 0) {
+ domain = get_winbind_domain();
+ /* '*' is the special sign for all domains */
+ } else if (strcmp(domain, "*") == 0) {
+ domain = NULL;
+ }
}
wbc_status = wbcListGroups(domain, &num_groups, &groups);
OPT_SEQUENCE,
OPT_GETDCNAME,
OPT_DSGETDCNAME,
+ OPT_DC_INFO,
OPT_USERDOMGROUPS,
OPT_SIDALIASES,
OPT_USERSIDS,
+ OPT_LOOKUP_SIDS,
OPT_ALLOCATE_UID,
OPT_ALLOCATE_GID,
OPT_SET_UID_MAPPING,
OPT_SET_GID_MAPPING,
OPT_REMOVE_UID_MAPPING,
OPT_REMOVE_GID_MAPPING,
+ OPT_SIDS_TO_XIDS,
+ OPT_XIDS_TO_SIDS,
OPT_SEPARATOR,
OPT_LIST_ALL_DOMAINS,
OPT_LIST_OWN_DOMAIN,
OPT_VERBOSE,
OPT_ONLINESTATUS,
OPT_CHANGE_USER_PASSWORD,
- OPT_PING_DC,
OPT_CCACHE_SAVE,
OPT_SID_TO_FULLNAME,
+ OPT_NTLMV1,
OPT_NTLMV2,
OPT_PAM_LOGON,
OPT_LOGOFF,
OPT_LOGOFF_USER,
OPT_LOGOFF_UID,
- OPT_LANMAN
+ OPT_LANMAN,
+ OPT_KRB5CCNAME
};
-int main(int argc, char **argv, char **envp)
+int main(int argc, const char **argv, char **envp)
{
int opt;
TALLOC_CTX *frame = talloc_stackframe();
int int_subarg = -1;
int result = 1;
bool verbose = false;
- bool use_ntlmv2 = false;
+ bool use_ntlmv2 = true;
bool use_lanman = false;
char *logoff_user = getenv("USER");
int logoff_uid = geteuid();
+ const char *opt_krb5ccname = "FILE";
struct poptOption long_options[] = {
POPT_AUTOHELP
/* longName, shortName, argInfo, argPtr, value, descrip,
argDesc */
- { "domain-users", 'u', POPT_ARG_NONE, 0, 'u', "Lists all domain users", "domain"},
- { "domain-groups", 'g', POPT_ARG_NONE, 0, 'g', "Lists all domain groups", "domain" },
- { "WINS-by-name", 'N', POPT_ARG_STRING, &string_arg, 'N', "Converts NetBIOS name to IP", "NETBIOS-NAME" },
- { "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name", "IP" },
- { "name-to-sid", 'n', POPT_ARG_STRING, &string_arg, 'n', "Converts name to sid", "NAME" },
- { "sid-to-name", 's', POPT_ARG_STRING, &string_arg, 's', "Converts sid to name", "SID" },
- { "sid-to-fullname", 0, POPT_ARG_STRING, &string_arg,
- OPT_SID_TO_FULLNAME, "Converts sid to fullname", "SID" },
- { "lookup-rids", 'R', POPT_ARG_STRING, &string_arg, 'R', "Converts RIDs to names", "RIDs" },
- { "uid-to-sid", 'U', POPT_ARG_INT, &int_arg, 'U', "Converts uid to sid" , "UID" },
- { "gid-to-sid", 'G', POPT_ARG_INT, &int_arg, 'G', "Converts gid to sid", "GID" },
- { "sid-to-uid", 'S', POPT_ARG_STRING, &string_arg, 'S', "Converts sid to uid", "SID" },
- { "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid", "SID" },
- { "allocate-uid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_UID,
- "Get a new UID out of idmap" },
- { "allocate-gid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_GID,
- "Get a new GID out of idmap" },
- { "set-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_UID_MAPPING, "Create or modify uid to sid mapping in idmap", "UID,SID" },
- { "set-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_GID_MAPPING, "Create or modify gid to sid mapping in idmap", "GID,SID" },
- { "remove-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_UID_MAPPING, "Remove uid to sid mapping in idmap", "UID,SID" },
- { "remove-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_GID_MAPPING, "Remove gid to sid mapping in idmap", "GID,SID" },
- { "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
- { "change-secret", 'c', POPT_ARG_NONE, 0, 'c', "Change shared secret" },
- { "ping-dc", 0, POPT_ARG_NONE, 0, OPT_PING_DC,
- "Check the NETLOGON connection" },
- { "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" },
- { "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS, "List all domains (trusted and own domain)" },
- { "own-domain", 0, POPT_ARG_NONE, 0, OPT_LIST_OWN_DOMAIN, "List own domain" },
- { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Deprecated command, see --online-status" },
- { "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains are marked as online or offline"},
- { "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show most of the info we have about the domain" },
- { "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" },
- { "uid-info", 0, POPT_ARG_INT, &int_arg, OPT_UID_INFO, "Get user info from uid", "UID" },
- { "group-info", 0, POPT_ARG_STRING, &string_arg, OPT_GROUP_INFO, "Get group info", "GROUP" },
- { "user-sidinfo", 0, POPT_ARG_STRING, &string_arg, OPT_USER_SIDINFO, "Get user info from sid", "SID" },
- { "gid-info", 0, POPT_ARG_INT, &int_arg, OPT_GID_INFO, "Get group info from gid", "GID" },
- { "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
- { "user-domgroups", 0, POPT_ARG_STRING, &string_arg,
- OPT_USERDOMGROUPS, "Get user domain groups", "SID" },
- { "sid-aliases", 0, POPT_ARG_STRING, &string_arg, OPT_SIDALIASES, "Get sid aliases", "SID" },
- { "user-sids", 0, POPT_ARG_STRING, &string_arg, OPT_USERSIDS, "Get user group sids for user SID", "SID" },
- { "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
- { "pam-logon", 0, POPT_ARG_STRING, string_arg, OPT_PAM_LOGON,
- "do a pam logon equivalent", "user%password" },
- { "logoff", 0, POPT_ARG_NONE, NULL, OPT_LOGOFF,
- "log off user", "uid" },
- { "logoff-user", 0, POPT_ARG_STRING, &logoff_user,
- OPT_LOGOFF_USER, "username to log off" },
- { "logoff-uid", 0, POPT_ARG_INT, &logoff_uid,
- OPT_LOGOFF_UID, "uid to log off" },
- { "set-auth-user", 0, POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
- { "ccache-save", 0, POPT_ARG_STRING, &string_arg,
- OPT_CCACHE_SAVE, "Store user and password for ccache "
- "operation", "user%password" },
- { "getdcname", 0, POPT_ARG_STRING, &string_arg, OPT_GETDCNAME,
- "Get a DC name for a foreign domain", "domainname" },
- { "dsgetdcname", 0, POPT_ARG_STRING, &string_arg, OPT_DSGETDCNAME, "Find a DC for a domain", "domainname" },
- { "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
- { "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" },
- { "domain", 0, POPT_ARG_STRING, &opt_domain_name, OPT_DOMAIN_NAME, "Define to the domain to restrict operation", "domain" },
+ {
+ .longName = "domain-users",
+ .shortName = 'u',
+ .argInfo = POPT_ARG_NONE,
+ .val = 'u',
+ .descrip = "Lists all domain users",
+ .argDescrip = "domain"
+ },
+ {
+ .longName = "domain-groups",
+ .shortName = 'g',
+ .argInfo = POPT_ARG_NONE,
+ .val = 'g',
+ .descrip = "Lists all domain groups",
+ .argDescrip = "domain"
+ },
+ {
+ .longName = "WINS-by-name",
+ .shortName = 'N',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'N',
+ .descrip = "Converts NetBIOS name to IP",
+ .argDescrip = "NETBIOS-NAME"
+ },
+ {
+ .longName = "WINS-by-ip",
+ .shortName = 'I',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'I',
+ .descrip = "Converts IP address to NetBIOS name",
+ .argDescrip = "IP"
+ },
+ {
+ .longName = "name-to-sid",
+ .shortName = 'n',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'n',
+ .descrip = "Converts name to sid",
+ .argDescrip = "NAME"
+ },
+ {
+ .longName = "sid-to-name",
+ .shortName = 's',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 's',
+ .descrip = "Converts sid to name",
+ .argDescrip = "SID"
+ },
+ {
+ .longName = "sid-to-fullname",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SID_TO_FULLNAME,
+ .descrip = "Converts sid to fullname",
+ .argDescrip = "SID"
+ },
+ {
+ .longName = "lookup-rids",
+ .shortName = 'R',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'R',
+ .descrip = "Converts RIDs to names",
+ .argDescrip = "RIDs"
+ },
+ {
+ .longName = "lookup-sids",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_LOOKUP_SIDS,
+ .descrip = "Converts SIDs to types and names",
+ .argDescrip = "Sid-List"
+ },
+ {
+ .longName = "uid-to-sid",
+ .shortName = 'U',
+ .argInfo = POPT_ARG_INT,
+ .arg = &int_arg,
+ .val = 'U',
+ .descrip = "Converts uid to sid",
+ .argDescrip = "UID"
+ },
+ {
+ .longName = "gid-to-sid",
+ .shortName = 'G',
+ .argInfo = POPT_ARG_INT,
+ .arg = &int_arg,
+ .val = 'G',
+ .descrip = "Converts gid to sid",
+ .argDescrip = "GID"
+ },
+ {
+ .longName = "sid-to-uid",
+ .shortName = 'S',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'S',
+ .descrip = "Converts sid to uid",
+ .argDescrip = "SID"
+ },
+ {
+ .longName = "sid-to-gid",
+ .shortName = 'Y',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'Y',
+ .descrip = "Converts sid to gid",
+ .argDescrip = "SID"
+ },
+ {
+ .longName = "allocate-uid",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_ALLOCATE_UID,
+ .descrip = "Get a new UID out of idmap"
+ },
+ {
+ .longName = "allocate-gid",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_ALLOCATE_GID,
+ .descrip = "Get a new GID out of idmap"
+ },
+ {
+ .longName = "set-uid-mapping",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SET_UID_MAPPING,
+ .descrip = "Create or modify uid to sid mapping in "
+ "idmap",
+ .argDescrip = "UID,SID"
+ },
+ {
+ .longName = "set-gid-mapping",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SET_GID_MAPPING,
+ .descrip = "Create or modify gid to sid mapping in "
+ "idmap",
+ .argDescrip = "GID,SID"
+ },
+ {
+ .longName = "remove-uid-mapping",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_REMOVE_UID_MAPPING,
+ .descrip = "Remove uid to sid mapping in idmap",
+ .argDescrip = "UID,SID"
+ },
+ {
+ .longName = "remove-gid-mapping",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_REMOVE_GID_MAPPING,
+ .descrip = "Remove gid to sid mapping in idmap",
+ .argDescrip = "GID,SID",
+ },
+ {
+ .longName = "sids-to-unix-ids",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SIDS_TO_XIDS,
+ .descrip = "Translate SIDs to Unix IDs",
+ .argDescrip = "Sid-List",
+ },
+ {
+ .longName = "unix-ids-to-sids",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_XIDS_TO_SIDS,
+ .descrip = "Translate Unix IDs to SIDs",
+ .argDescrip = "ID-List (u<num> g<num>)",
+ },
+ {
+ .longName = "check-secret",
+ .shortName = 't',
+ .argInfo = POPT_ARG_NONE,
+ .val = 't',
+ .descrip = "Check shared secret",
+ },
+ {
+ .longName = "change-secret",
+ .shortName = 'c',
+ .argInfo = POPT_ARG_NONE,
+ .val = 'c',
+ .descrip = "Change shared secret",
+ },
+ {
+ .longName = "ping-dc",
+ .shortName = 'P',
+ .argInfo = POPT_ARG_NONE,
+ .val = 'P',
+ .descrip = "Check the NETLOGON connection",
+ },
+ {
+ .longName = "trusted-domains",
+ .shortName = 'm',
+ .argInfo = POPT_ARG_NONE,
+ .val = 'm',
+ .descrip = "List trusted domains",
+ },
+ {
+ .longName = "all-domains",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_LIST_ALL_DOMAINS,
+ .descrip = "List all domains (trusted and own "
+ "domain)",
+ },
+ {
+ .longName = "own-domain",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_LIST_OWN_DOMAIN,
+ .descrip = "List own domain",
+ },
+ {
+ .longName = "sequence",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_SEQUENCE,
+ .descrip = "Deprecated command, see --online-status",
+ },
+ {
+ .longName = "online-status",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_ONLINESTATUS,
+ .descrip = "Show whether domains maintain an active "
+ "connection",
+ },
+ {
+ .longName = "domain-info",
+ .shortName = 'D',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'D',
+ .descrip = "Show most of the info we have about the "
+ "domain",
+ },
+ {
+ .longName = "user-info",
+ .shortName = 'i',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'i',
+ .descrip = "Get user info",
+ .argDescrip = "USER",
+ },
+ {
+ .longName = "uid-info",
+ .argInfo = POPT_ARG_INT,
+ .arg = &int_arg,
+ .val = OPT_UID_INFO,
+ .descrip = "Get user info from uid",
+ .argDescrip = "UID",
+ },
+ {
+ .longName = "group-info",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_GROUP_INFO,
+ .descrip = "Get group info",
+ .argDescrip = "GROUP",
+ },
+ {
+ .longName = "user-sidinfo",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_USER_SIDINFO,
+ .descrip = "Get user info from sid",
+ .argDescrip = "SID",
+ },
+ {
+ .longName = "gid-info",
+ .argInfo = POPT_ARG_INT,
+ .arg = &int_arg,
+ .val = OPT_GID_INFO,
+ .descrip = "Get group info from gid",
+ .argDescrip = "GID",
+ },
+ {
+ .longName = "user-groups",
+ .shortName = 'r',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'r',
+ .descrip = "Get user groups",
+ .argDescrip = "USER",
+ },
+ {
+ .longName = "user-domgroups",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_USERDOMGROUPS,
+ .descrip = "Get user domain groups",
+ .argDescrip = "SID",
+ },
+ {
+ .longName = "sid-aliases",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SIDALIASES,
+ .descrip = "Get sid aliases",
+ .argDescrip = "SID",
+ },
+ {
+ .longName = "user-sids",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_USERSIDS,
+ .descrip = "Get user group sids for user SID",
+ .argDescrip = "SID",
+ },
+ {
+ .longName = "authenticate",
+ .shortName = 'a',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'a',
+ .descrip = "authenticate user",
+ .argDescrip = "user%password",
+ },
+ {
+ .longName = "pam-logon",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_PAM_LOGON,
+ .descrip = "do a pam logon equivalent",
+ .argDescrip = "user%password",
+ },
+ {
+ .longName = "logoff",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_LOGOFF,
+ .descrip = "log off user",
+ .argDescrip = "uid",
+ },
+ {
+ .longName = "logoff-user",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &logoff_user,
+ .val = OPT_LOGOFF_USER,
+ .descrip = "username to log off"
+ },
+ {
+ .longName = "logoff-uid",
+ .argInfo = POPT_ARG_INT,
+ .arg = &logoff_uid,
+ .val = OPT_LOGOFF_UID,
+ .descrip = "uid to log off",
+ },
+ {
+ .longName = "set-auth-user",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_SET_AUTH_USER,
+ .descrip = "Store user and password used by "
+ "winbindd (root only)",
+ .argDescrip = "user%password",
+ },
+ {
+ .longName = "ccache-save",
+ .shortName = 0,
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_CCACHE_SAVE,
+ .descrip = "Store user and password for ccache "
+ "operation",
+ .argDescrip = "user%password",
+ },
+ {
+ .longName = "getdcname",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_GETDCNAME,
+ .descrip = "Get a DC name for a foreign domain",
+ .argDescrip = "domainname",
+ },
+ {
+ .longName = "dsgetdcname",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_DSGETDCNAME,
+ .descrip = "Find a DC for a domain",
+ .argDescrip = "domainname",
+ },
+ {
+ .longName = "dc-info",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_DC_INFO,
+ .descrip = "Find the currently known DCs",
+ .argDescrip = "domainname",
+ },
+ {
+ .longName = "get-auth-user",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_GET_AUTH_USER,
+ .descrip = "Retrieve user and password used by "
+ "winbindd (root only)",
+ },
+ {
+ .longName = "ping",
+ .shortName = 'p',
+ .argInfo = POPT_ARG_NONE,
+ .arg = 0,
+ .val = 'p',
+ .descrip = "Ping winbindd to see if it is alive",
+ },
+ {
+ .longName = "domain",
+ .shortName = 0,
+ .argInfo = POPT_ARG_STRING,
+ .arg = &opt_domain_name,
+ .val = OPT_DOMAIN_NAME,
+ .descrip = "Define to the domain to restrict "
+ "operation",
+ .argDescrip = "domain",
+ },
#ifdef WITH_FAKE_KASERVER
- { "klog", 'k', POPT_ARG_STRING, &string_arg, 'k', "set an AFS token from winbind", "user%password" },
+ {
+ .longName = "klog",
+ .shortName = 'k',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'k',
+ .descrip = "set an AFS token from winbind",
+ .argDescrip = "user%password",
+ },
#endif
#ifdef HAVE_KRB5
- { "krb5auth", 'K', POPT_ARG_STRING, &string_arg, 'K', "authenticate user using Kerberos", "user%password" },
+ {
+ .longName = "krb5auth",
+ .shortName = 'K',
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = 'K',
+ .descrip = "authenticate user using Kerberos",
+ .argDescrip = "user%password",
+ },
/* destroys wbinfo --help output */
- /* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" }, */
+ /* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" },
+ */
+ {
+ .longName = "krb5ccname",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &opt_krb5ccname,
+ .val = OPT_KRB5CCNAME,
+ .descrip = "authenticate user using Kerberos and "
+ "specific credential cache type",
+ .argDescrip = "krb5ccname",
+ },
#endif
- { "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL },
- { "verbose", 0, POPT_ARG_NONE, 0, OPT_VERBOSE, "Print additional information per command", NULL },
- { "change-user-password", 0, POPT_ARG_STRING, &string_arg, OPT_CHANGE_USER_PASSWORD, "Change the password for a user", NULL },
- { "ntlmv2", 0, POPT_ARG_NONE, 0, OPT_NTLMV2, "Use NTLMv2 cryptography for user authentication", NULL},
- { "lanman", 0, POPT_ARG_NONE, 0, OPT_LANMAN, "Use lanman cryptography for user authentication", NULL},
+ {
+ .longName = "separator",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_SEPARATOR,
+ .descrip = "Get the active winbind separator",
+ },
+ {
+ .longName = "verbose",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_VERBOSE,
+ .descrip = "Print additional information per command",
+ },
+ {
+ .longName = "change-user-password",
+ .argInfo = POPT_ARG_STRING,
+ .arg = &string_arg,
+ .val = OPT_CHANGE_USER_PASSWORD,
+ .descrip = "Change the password for a user",
+ },
+ {
+ .longName = "ntlmv1",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_NTLMV1,
+ .descrip = "Use NTLMv1 cryptography for user authentication",
+ },
+ {
+ .longName = "ntlmv2",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_NTLMV2,
+ .descrip = "Use NTLMv2 cryptography for user authentication",
+ },
+ {
+ .longName = "lanman",
+ .argInfo = POPT_ARG_NONE,
+ .val = OPT_LANMAN,
+ .descrip = "Use lanman cryptography for user authentication",
+ },
POPT_COMMON_VERSION
POPT_TABLEEND
};
/* Samba client initialisation */
- load_case_tables();
+ smb_init_locale();
/* Parse options */
- pc = poptGetContext("wbinfo", argc, (const char **)argv,
+ pc = poptGetContext("wbinfo", argc, argv,
long_options, 0);
/* Parse command line options */
case OPT_VERBOSE:
verbose = true;
break;
- case OPT_NTLMV2:
- use_ntlmv2 = true;
+ case OPT_NTLMV1:
+ use_ntlmv2 = false;
break;
case OPT_LANMAN:
use_lanman = true;
goto done;
}
break;
+ case OPT_LOOKUP_SIDS:
+ if (!wbinfo_lookup_sids(string_arg)) {
+ d_fprintf(stderr, "Could not lookup SIDs %s\n",
+ string_arg);
+ goto done;
+ }
+ break;
case 'n':
if (!wbinfo_lookupname(string_arg)) {
d_fprintf(stderr, "Could not lookup name %s\n",
goto done;
}
break;
+ case OPT_SIDS_TO_XIDS:
+ if (!wbinfo_sids_to_unix_ids(string_arg)) {
+ d_fprintf(stderr, "wbinfo_sids_to_unix_ids "
+ "failed\n");
+ goto done;
+ }
+ break;
+ case OPT_XIDS_TO_SIDS:
+ if (!wbinfo_xids_to_sids(string_arg)) {
+ d_fprintf(stderr, "wbinfo_xids_to_sids "
+ "failed\n");
+ goto done;
+ }
+ break;
case 't':
if (!wbinfo_check_secret(opt_domain_name)) {
d_fprintf(stderr, "Could not check secret\n");
goto done;
}
break;
- case OPT_PING_DC:
- if (!wbinfo_ping_dc()) {
- d_fprintf(stderr, "Could not ping our DC\n");
+ case 'P':
+ if (!wbinfo_ping_dc(opt_domain_name)) {
goto done;
}
break;
break;
}
case OPT_PAM_LOGON:
- if (!wbinfo_pam_logon(string_arg)) {
+ if (!wbinfo_pam_logon(string_arg, verbose)) {
d_fprintf(stderr, "pam_logon failed for %s\n",
string_arg);
goto done;
}
+ break;
case OPT_LOGOFF:
{
wbcErr wbc_status;
WBFLAG_PAM_INFO3_TEXT |
WBFLAG_PAM_CONTACT_TRUSTDOM;
- if (!wbinfo_auth_krb5(string_arg, "FILE",
+ if (!wbinfo_auth_krb5(string_arg, opt_krb5ccname,
flags)) {
d_fprintf(stderr,
"Could not authenticate user "
"[%s] with Kerberos "
"(ccache: %s)\n", string_arg,
- "FILE");
+ opt_krb5ccname);
goto done;
}
break;
goto done;
}
break;
+ case OPT_DC_INFO:
+ if (!wbinfo_dc_info(string_arg)) {
+ goto done;
+ }
+ break;
case OPT_SEPARATOR: {
const char sep = winbind_separator();
if ( !sep ) {
/* generic configuration options */
case OPT_DOMAIN_NAME:
case OPT_VERBOSE:
+ case OPT_NTLMV1:
case OPT_NTLMV2:
case OPT_LANMAN:
case OPT_LOGOFF_USER:
case OPT_LOGOFF_UID:
+ case OPT_KRB5CCNAME:
break;
default:
d_fprintf(stderr, "Invalid option\n");
git.samba.org / samba.git / blobdiff