Alan,
Try the attached patch, it add krb5principal and krb5keytab to the
amanda-client.conf file.
Jean-Louis
alan pearson wrote:
Ok, so now I'm fighting with amanda-client.conf
It seems it only allows options that are specified in the man page, so I cannot
specify the krb5principal or krb5keytab
Is there a way to tell amrecover how to get this info ?
Cheers
Alan
diff -u -r --show-c-function --new-file
--exclude-from=/home/martinea/src.orig/amanda.diff
--ignore-matching-lines='$Id:' amanda-2.5.1p3/client-src/clientconf.c
amanda-2.5.1p3.krb5/client-src/clientconf.c
--- amanda-2.5.1p3/client-src/clientconf.c 2007-01-24 13:33:29.000000000
-0500
+++ amanda-2.5.1p3.krb5/client-src/clientconf.c 2007-03-05 11:11:54.000000000
-0500
@@ -71,6 +71,8 @@ keytab_t client_keytab[] = {
{ "CLIENT_USERNAME", CONF_CLIENT_USERNAME },
{ "GNUTAR_LIST_DIR", CONF_GNUTAR_LIST_DIR },
{ "AMANDATES", CONF_AMANDATES },
+ { "KRB5KEYTAB", CONF_KRB5KEYTAB },
+ { "KRB5PRINCIPAL", CONF_KRB5PRINCIPAL },
{ "INCLUDEFILE", CONF_INCLUDEFILE },
{ NULL, CONF_UNKNOWN },
};
@@ -86,6 +88,8 @@ t_conf_var client_var [] = {
{ CONF_CLIENT_USERNAME, CONFTYPE_STRING, read_string, CLN_CLIENT_USERNAME,
NULL },
{ CONF_GNUTAR_LIST_DIR, CONFTYPE_STRING, read_string, CLN_GNUTAR_LIST_DIR,
NULL },
{ CONF_AMANDATES , CONFTYPE_STRING, read_string, CLN_AMANDATES ,
NULL },
+ { CONF_KRB5KEYTAB , CONFTYPE_STRING, read_string, CLN_KRB5KEYTAB ,
NULL },
+ { CONF_KRB5PRINCIPAL , CONFTYPE_STRING, read_string, CLN_KRB5PRINCIPAL ,
NULL },
{ CONF_UNKNOWN , CONFTYPE_INT , NULL , CLN_CLN ,
NULL }
};
@@ -300,6 +304,8 @@ init_defaults(void)
conf_init_string(&client_conf[CLN_GNUTAR_LIST_DIR], NULL);
#endif
conf_init_string(&client_conf[CLN_AMANDATES], AMANDATES_FILE);
+ conf_init_string(&client_conf[CLN_KRB5KEYTAB], "/.amanda-v5-keytab");
+ conf_init_string(&client_conf[CLN_KRB5PRINCIPAL], "service/amanda");
/* defaults for internal variables */
conf_line_num = got_parserror = 0;
@@ -518,12 +524,10 @@ generic_client_get_security_conf(
return(client_getconf_str(CLN_GNUTAR_LIST_DIR));
} else if(strcmp(string, "amandates")==0) {
return(client_getconf_str(CLN_AMANDATES));
-/*
} else if(strcmp(string, "krb5principal")==0) {
- return(client_getconf_str(CNF_KRB5PRINCIPAL));
+ return(client_getconf_str(CLN_KRB5PRINCIPAL));
} else if(strcmp(string, "krb5keytab")==0) {
- return(client_getconf_str(CNF_KRB5KEYTAB));
-*/
+ return(client_getconf_str(CLN_KRB5KEYTAB));
}
return(NULL);
}
diff -u -r --show-c-function --new-file
--exclude-from=/home/martinea/src.orig/amanda.diff
--ignore-matching-lines='$Id:' amanda-2.5.1p3/client-src/clientconf.h
amanda-2.5.1p3.krb5/client-src/clientconf.h
--- amanda-2.5.1p3/client-src/clientconf.h 2006-07-25 15:06:46.000000000
-0400
+++ amanda-2.5.1p3.krb5/client-src/clientconf.h 2007-03-05 11:07:29.000000000
-0500
@@ -47,6 +47,8 @@ typedef enum conf_e {
CLN_CLIENT_USERNAME,
CLN_GNUTAR_LIST_DIR,
CLN_AMANDATES,
+ CLN_KRB5KEYTAB,
+ CLN_KRB5PRINCIPAL,
CLN_CLN
} cconfparm_t;
|