sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r23648: Allow to list a custom krb5 keytab file with:

Browse Source 
net ads keytab list /path/to/krb5.keytab

Guenther
This commit is contained in:
Günther Deschner 2007-06-29 09:01:29 +00:00 committed by Gerald (Jerry) Carter
parent d22c0d291e
commit a2befee3f2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libads/kerberos_keytab.c
View File

@ -801,7 +801,7 @@ done:
List system keytab.
***********************************************************************/
int ads_keytab_list(void)
int ads_keytab_list(const char *keytab_name)
{
krb5_error_code ret = 0;
krb5_context context = NULL;
@ -819,7 +819,7 @@ int ads_keytab_list(void)
return ret;
}
ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
ret = smb_krb5_open_keytab(context, keytab_name, False, &keytab);
if (ret) {
DEBUG(1,("ads_keytab_list: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
goto out;

13
source/utils/net_ads.c
View File

@ -2423,12 +2423,13 @@ static int net_ads_keytab_usage(int argc, const char **argv)
" FLUSH Flushes out all keytab entries\n"\
" HELP Prints this help message\n"\
" LIST List the keytab\n"\
"The ADD command will take arguments, the other commands\n"\
"The ADD and LIST command will take arguments, the other commands\n"\
"will not take any arguments. The arguments given to ADD\n"\
"should be a list of principals to add. For example, \n"\
" net ads keytab add srv1 srv2\n"\
"will add principals for the services srv1 and srv2 to the\n"\
"system's keytab.\n"\
"The LIST command takes a keytabname.\n"\
"\n"
);
return -1;
@ -2479,15 +2480,21 @@ static int net_ads_keytab_create(int argc, const char **argv)
static int net_ads_keytab_list(int argc, const char **argv)
{
return ads_keytab_list();
const char *keytab = NULL;
if (argc >= 1) {
keytab = argv[0];
}
return ads_keytab_list(keytab);
}
int net_ads_keytab(int argc, const char **argv)
{
struct functable func[] = {
{"CREATE", net_ads_keytab_create},
{"ADD", net_ads_keytab_add},
{"CREATE", net_ads_keytab_create},
{"FLUSH", net_ads_keytab_flush},
{"HELP", net_ads_keytab_usage},
{"LIST", net_ads_keytab_list},