sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-29 02:50:28 +03:00
Code

wbinfo: Use one codebase for Samba3 and Samba4.

Browse Source 
There can be only one....wbinfo that is.
This commit is contained in:
Kai Blin 2009-08-12 17:50:04 +02:00
parent 19855ca2bb
commit bc0e0a4c69
4 changed files with 9 additions and 1336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsswitch/config.mk
View File

@ -36,4 +36,4 @@ PRIVATE_DEPENDENCIES = \
#################################
wbinfo_OBJ_FILES = \
$(nsswitchsrcdir)/wbinfo4.o
$(nsswitchsrcdir)/wbinfo.o

10
nsswitch/wbinfo.c
View File

@ -4,7 +4,7 @@
Winbind status program.
Copyright (C) Tim Potter 2000-2003
Copyright (C) Andrew Bartlett 2002
Copyright (C) Andrew Bartlett 2002-2007
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -29,9 +29,10 @@
#include "lib/cmdline/popt_common.h"
#endif
#ifdef DBGC_CLASS
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
#endif
static struct wbcInterfaceDetails *init_interface_details(void)
{
@ -1214,6 +1215,7 @@ static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
char *p = NULL;
char *password = NULL;
char *name = NULL;
char *local_cctype = NULL;
uid_t uid;
struct wbcLogonUserParams params;
struct wbcLogonUserInfo *info;
@ -1233,6 +1235,8 @@ static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
password = wbinfo_prompt_pass(frame, NULL, username);
}
local_cctype = talloc_strdup(frame, cctype);
name = s;
uid = geteuid();
@ -1266,7 +1270,7 @@ static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
&params.blobs,
"krb5_cc_type",
0,
(uint8_t *)cctype,
(uint8_t *)local_cctype,
strlen(cctype)+1);
if (!WBC_ERROR_IS_OK(wbc_status)) {
goto done;

1331
nsswitch/wbinfo4.c
View File

File diff suppressed because it is too large Load Diff

2
source3/samba4.mk
View File

@ -167,7 +167,7 @@ modules:: $(PLUGINS)
pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup plugins
all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 pythonmods setup plugins
torture:: bin/smbtorture4
everything:: $(patsubst %,%4,$(BINARIES))
setup: