allow passing a realm
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -67,9 +67,11 @@ print_entry(u_int32_t ver,
|
|||||||
sp->seek (sp, len, SEEK_CUR);
|
sp->seek (sp, len, SEEK_CUR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *realm;
|
||||||
int version_flag;
|
int version_flag;
|
||||||
int help_flag;
|
int help_flag;
|
||||||
struct getargs args[] = {
|
struct getargs args[] = {
|
||||||
|
{ "realm", 'r', arg_string, &realm },
|
||||||
{ "version", 0, arg_flag, &version_flag },
|
{ "version", 0, arg_flag, &version_flag },
|
||||||
{ "help", 0, arg_flag, &help_flag }
|
{ "help", 0, arg_flag, &help_flag }
|
||||||
};
|
};
|
||||||
@@ -94,6 +96,10 @@ main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
memset(&conf, 0, sizeof(conf));
|
memset(&conf, 0, sizeof(conf));
|
||||||
|
if(realm) {
|
||||||
|
conf.mask |= KADM5_CONFIG_REALM;
|
||||||
|
conf.realm = realm;
|
||||||
|
}
|
||||||
ret = kadm5_init_with_password_ctx (context,
|
ret = kadm5_init_with_password_ctx (context,
|
||||||
KADM5_ADMIN_SERVICE,
|
KADM5_ADMIN_SERVICE,
|
||||||
NULL,
|
NULL,
|
||||||
|
@@ -296,9 +296,11 @@ process_msg (krb5_context context, slave *s, int log_fd,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *realm;
|
||||||
int version_flag;
|
int version_flag;
|
||||||
int help_flag;
|
int help_flag;
|
||||||
struct getargs args[] = {
|
struct getargs args[] = {
|
||||||
|
{ "realm", 'r', arg_string, &realm },
|
||||||
{ "version", 0, arg_flag, &version_flag },
|
{ "version", 0, arg_flag, &version_flag },
|
||||||
{ "help", 0, arg_flag, &help_flag }
|
{ "help", 0, arg_flag, &help_flag }
|
||||||
};
|
};
|
||||||
@@ -329,6 +331,10 @@ main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
memset(&conf, 0, sizeof(conf));
|
memset(&conf, 0, sizeof(conf));
|
||||||
|
if(realm) {
|
||||||
|
conf.mask |= KADM5_CONFIG_REALM;
|
||||||
|
conf.realm = realm;
|
||||||
|
}
|
||||||
ret = kadm5_init_with_password_ctx (context,
|
ret = kadm5_init_with_password_ctx (context,
|
||||||
KADM5_ADMIN_SERVICE,
|
KADM5_ADMIN_SERVICE,
|
||||||
NULL,
|
NULL,
|
||||||
|
@@ -208,9 +208,11 @@ receive (krb5_context context,
|
|||||||
krb5_err (context, 1, ret, "db->close");
|
krb5_err (context, 1, ret, "db->close");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *realm;
|
||||||
int version_flag;
|
int version_flag;
|
||||||
int help_flag;
|
int help_flag;
|
||||||
struct getargs args[] = {
|
struct getargs args[] = {
|
||||||
|
{ "realm", 'r', arg_string, &realm },
|
||||||
{ "version", 0, arg_flag, &version_flag },
|
{ "version", 0, arg_flag, &version_flag },
|
||||||
{ "help", 0, arg_flag, &help_flag }
|
{ "help", 0, arg_flag, &help_flag }
|
||||||
};
|
};
|
||||||
@@ -241,6 +243,10 @@ main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
memset(&conf, 0, sizeof(conf));
|
memset(&conf, 0, sizeof(conf));
|
||||||
|
if(realm) {
|
||||||
|
conf.mask |= KADM5_CONFIG_REALM;
|
||||||
|
conf.realm = realm;
|
||||||
|
}
|
||||||
ret = kadm5_init_with_password_ctx (context,
|
ret = kadm5_init_with_password_ctx (context,
|
||||||
KADM5_ADMIN_SERVICE,
|
KADM5_ADMIN_SERVICE,
|
||||||
NULL,
|
NULL,
|
||||||
|
Reference in New Issue
Block a user