summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin/testing')
-rw-r--r--src/kadmin/testing/proto/krb5.conf.proto1
-rw-r--r--src/kadmin/testing/tcl/util.t37
-rw-r--r--src/kadmin/testing/util/tcl_kadm5.c48
-rw-r--r--src/kadmin/testing/util/tcl_ovsec_kadm.c2
4 files changed, 40 insertions, 48 deletions
diff --git a/src/kadmin/testing/proto/krb5.conf.proto b/src/kadmin/testing/proto/krb5.conf.proto
index 9fe7ec124..c2648d6c6 100644
--- a/src/kadmin/testing/proto/krb5.conf.proto
+++ b/src/kadmin/testing/proto/krb5.conf.proto
@@ -7,7 +7,6 @@
__REALM__ = {
kdc = __KDCHOST__:1750
admin_server = __KDCHOST__:1751
-# THIS SHOULD BE IN KDC.CONF INSTEAD!
database_module = foobar_db2_module_blah
}
diff --git a/src/kadmin/testing/tcl/util.t b/src/kadmin/testing/tcl/util.t
index f4688aeee..0e39061f7 100644
--- a/src/kadmin/testing/tcl/util.t
+++ b/src/kadmin/testing/tcl/util.t
@@ -15,42 +15,41 @@ proc config_params {masks values} {
error "config_params: length of mask and values differ"
}
- set params [list $masks 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}]
+ set params [list $masks 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}]
for {set i 0} {$i < [llength $masks]} {incr i} {
set mask [lindex $masks $i]
set value [lindex $values $i]
switch -glob -- $mask {
"KADM5_CONFIG_REALM" {set params [lreplace $params 1 1 $value]}
- "KADM5_CONFIG_PROFILE" {set params [lreplace $params 2 2 $value]}
"KADM5_CONFIG_KADMIND_PORT" {
- set params [lreplace $params 3 3 $value]}
+ set params [lreplace $params 2 2 $value]}
"KADM5_CONFIG_ADMIN_SERVER" {
- set params [lreplace $params 4 4 $value]}
- "KADM5_CONFIG_DBNAME" {set params [lreplace $params 5 5 $value]}
- "KADM5_CONFIG_ADBNAME" {set params [lreplace $params 6 6 $value]}
+ set params [lreplace $params 3 3 $value]}
+ "KADM5_CONFIG_DBNAME" {set params [lreplace $params 4 4 $value]}
+ "KADM5_CONFIG_ADBNAME" {set params [lreplace $params 5 5 $value]}
"KADM5_CONFIG_ADB_LOCKFILE" {
- set params [lreplace $params 7 7 $value]}
+ set params [lreplace $params 6 6 $value]}
"KADM5_CONFIG_ADMIN_KEYTAB" {
- set params [lreplace $params 8 8 $value]}
- "KADM5_CONFIG_ACL_FILE" {set params [lreplace $params 9 9 $value]}
+ set params [lreplace $params 7 7 $value]}
+ "KADM5_CONFIG_ACL_FILE" {set params [lreplace $params 8 8 $value]}
"KADM5_CONFIG_DICT_FILE" {
- set params [lreplace $params 10 10 $value]}
+ set params [lreplace $params 9 9 $value]}
"KADM5_CONFIG_MKEY_FROM_KBD" {
- set params [lreplace $params 11 11 $value]}
+ set params [lreplace $params 10 10 $value]}
"KADM5_CONFIG_STASH_FILE" {
- set params [lreplace $params 12 12 $value]}
+ set params [lreplace $params 11 11 $value]}
"KADM5_CONFIG_MKEY_NAME" {
- set params [lreplace $params 13 13 $value]}
- "KADM5_CONFIG_ENCTYPE" {set params [lreplace $params 14 14 $value]}
+ set params [lreplace $params 12 12 $value]}
+ "KADM5_CONFIG_ENCTYPE" {set params [lreplace $params 13 13 $value]}
"KADM5_CONFIG_MAX_LIFE" {
- set params [lreplace $params 15 15 $value]}
+ set params [lreplace $params 14 14 $value]}
"KADM5_CONFIG_MAX_RLIFE" {
- set params [lreplace $params 16 16 $value]}
+ set params [lreplace $params 15 15 $value]}
"KADM5_CONFIG_EXPIRATION" {
- set params [lreplace $params 17 17 $value]}
- "KADM5_CONFIG_FLAGS" {set params [lreplace $params 18 18 $value]}
+ set params [lreplace $params 16 16 $value]}
+ "KADM5_CONFIG_FLAGS" {set params [lreplace $params 17 17 $value]}
"KADM5_CONFIG_ENCTYPES" {
- set params [lreplace $params 19 20 [llength $value] $value]}
+ set params [lreplace $params 18 19 [llength $value] $value]}
"*" {error "config_params: unknown mask $mask"}
}
}
diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
index e177d7b7d..fb6466db2 100644
--- a/src/kadmin/testing/util/tcl_kadm5.c
+++ b/src/kadmin/testing/util/tcl_kadm5.c
@@ -87,7 +87,6 @@ static struct flagval config_mask_flags[] = {
{"KADM5_CONFIG_ENCTYPE", KADM5_CONFIG_ENCTYPE},
{"KADM5_CONFIG_ADBNAME", KADM5_CONFIG_ADBNAME},
{"KADM5_CONFIG_ADB_LOCKFILE", KADM5_CONFIG_ADB_LOCKFILE},
- {"KADM5_CONFIG_PROFILE", KADM5_CONFIG_PROFILE},
{"KADM5_CONFIG_ACL_FILE", KADM5_CONFIG_ACL_FILE},
{"KADM5_CONFIG_KADMIND_PORT", KADM5_CONFIG_KADMIND_PORT},
{"KADM5_CONFIG_ENCTYPES", KADM5_CONFIG_ENCTYPES},
@@ -994,9 +993,9 @@ static int parse_config_params(Tcl_Interp *interp, char *list,
return retcode;
}
- if (argc != 21) {
+ if (argc != 20) {
sprintf(interp->result,
- "wrong # args in config params structure (%d should be 21)",
+ "wrong # args in config params structure (%d should be 20)",
argc);
retcode = TCL_ERROR;
goto finished;
@@ -1015,114 +1014,109 @@ static int parse_config_params(Tcl_Interp *interp, char *list,
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[2], &params->profile)) != TCL_OK) {
- Tcl_AppendElement(interp, "while parsing profile name");
- retcode = TCL_ERROR;
- goto finished;
- }
- if ((retcode = Tcl_GetInt(interp, argv[3], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[2], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing kadmind_port");
retcode = TCL_ERROR;
goto finished;
}
params->kadmind_port = tmp;
- if ((retcode = parse_str(interp, argv[4], &params->admin_server))
+ if ((retcode = parse_str(interp, argv[3], &params->admin_server))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing profile name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[5], &params->dbname)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[4], &params->dbname)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing profile name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[6], &params->admin_dbname)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[5], &params->admin_dbname)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing admin_dbname name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[7], &params->admin_lockfile)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[6], &params->admin_lockfile)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing admin_lockfile name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[8], &params->admin_keytab)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[7], &params->admin_keytab)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing admin_keytab name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[9], &params->acl_file)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[8], &params->acl_file)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing acl_file name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[10], &params->dict_file)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[9], &params->dict_file)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing dict_file name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = Tcl_GetInt(interp, argv[11], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[10], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing mkey_from_kbd");
retcode = TCL_ERROR;
goto finished;
}
params->mkey_from_kbd = tmp;
- if ((retcode = parse_str(interp, argv[12], &params->stash_file)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[11], &params->stash_file)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing stash_file name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = parse_str(interp, argv[13], &params->mkey_name)) != TCL_OK) {
+ if ((retcode = parse_str(interp, argv[12], &params->mkey_name)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing mkey_name name");
retcode = TCL_ERROR;
goto finished;
}
- if ((retcode = Tcl_GetInt(interp, argv[14], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[13], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing enctype");
retcode = TCL_ERROR;
goto finished;
}
params->enctype = tmp;
- if ((retcode = Tcl_GetInt(interp, argv[15], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[14], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing max_life");
retcode = TCL_ERROR;
goto finished;
}
params->max_life = tmp;
- if ((retcode = Tcl_GetInt(interp, argv[16], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[15], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing max_rlife");
retcode = TCL_ERROR;
goto finished;
}
params->max_rlife = tmp;
- if ((retcode = Tcl_GetInt(interp, argv[17], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[16], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing expiration");
retcode = TCL_ERROR;
goto finished;
}
params->expiration = tmp;
- if ((retcode = parse_krb5_flags(interp, argv[18], &tmp))
+ if ((retcode = parse_krb5_flags(interp, argv[17], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing flags");
retcode = TCL_ERROR;
goto finished;
}
params->flags = tmp;
- if ((retcode = Tcl_GetInt(interp, argv[19], &tmp))
+ if ((retcode = Tcl_GetInt(interp, argv[18], &tmp))
!= TCL_OK) {
Tcl_AppendElement(interp, "while parsing num_keysalts");
retcode = TCL_ERROR;
goto finished;
}
params->num_keysalts = tmp;
- if ((retcode = parse_keysalts(interp, argv[20], &params->keysalts,
+ if ((retcode = parse_keysalts(interp, argv[19], &params->keysalts,
params->num_keysalts)) != TCL_OK) {
Tcl_AppendElement(interp, "while parsing keysalts");
retcode = TCL_ERROR;
@@ -1578,7 +1572,7 @@ static int _tcl_kadm5_init_any(enum init_type init_type, ClientData clientData,
argv++, argc--;
- krb5_init_context(&context);
+ kadm5_init_krb5_context(&context);
if (argc != 7) {
Tcl_AppendResult(interp, whoami, ": ", arg_error, 0);
diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index c64657d75..7e04f04e9 100644
--- a/src/kadmin/testing/util/tcl_ovsec_kadm.c
+++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c
@@ -1018,7 +1018,7 @@ static int tcl_ovsec_kadm_init(ClientData clientData, Tcl_Interp *interp,
argv++, argc--;
- krb5_init_context(&context);
+ kadm5_init_krb5_context(&context);
if (argc != 7) {
Tcl_AppendResult(interp, whoami, ": ", arg_error, 0);
generated by cgit (git 2.34.1) at 2026-03-22 03:06:26 +0000