|
From: | shishi-commit |
Subject: | Use progname. [...] |
Date: | Wed, 10 Dec 2003 23:43:23 +0100 |
Commit from jas | 2003-12-10 23:43 CET |
Use progname. Don't generate key when adding realms. Set realm and principal in keys.
Module | File name | Revision | |||
---|---|---|---|---|---|
shishi | src/shisa.c | 1.21 | >>> | 1.22 |
shishi/src/shisa.c 1.21 >>> 1.22 |
---|
Line 39 |
#define gettext_noop(String) String #define N_(String) gettext_noop (String) |
+ #include "progname.h" + |
#include <shisa.h> #include <shishi.h> #include "shisa_cmd.h" |
- /* The name the program was run with, stripped of any leading path. */ - char *program_name; - |
Shishi *sh; Shisa *dbh; struct gengetopt_args_info args_info; |
Line 227 |
int32_t etype; int rc; |
- if (args_info.encryption_type_given) |
+ if (principal != NULL) |
{ |
- rc = shishi_cfg_clientkdcetype_set (sh, args_info.encryption_type_arg); - if (rc != SHISHI_OK) - return EXIT_FAILURE; - } - etype = shishi_cfg_clientkdcetype_fast (sh); |
+ etype = shishi_cfg_clientkdcetype_fast (sh); |
|
- if (salt == NULL) - asprintf (&salt, "%s%s", realm, principal); |
+ if (salt == NULL) + asprintf (&salt, "%s%s", realm, principal); |
|
- if (args_info.string_to_key_parameter_given) - { - /* XXX */ - } |
+ if (args_info.string_to_key_parameter_given) + { + /* XXX */ + } |
|
- if (args_info.password_given) - { - if (!passwd) |
+ if (args_info.password_given) |
{ |
- rc = shishi_prompt_password (sh, &passwd, "Password for address@hidden': ", - principal, realm); - if (rc != SHISHI_OK) - return EXIT_FAILURE; |
+ if (!passwd) + { + rc = shishi_prompt_password (sh, &passwd, + "Password for address@hidden': ", + principal, realm); + if (rc != SHISHI_OK) + return EXIT_FAILURE; + } + + rc = shishi_key_from_string (sh, etype, + passwd, strlen (passwd), + salt, strlen (salt), + str2keyparam, + &key); |
} |
+ else + rc = shishi_key_random (sh, etype, &key); + if (rc != SHISHI_OK) + return EXIT_FAILURE; |
|
- rc = shishi_key_from_string (sh, etype, - passwd, strlen (passwd), - salt, strlen (salt), - str2keyparam, - &key); - } - else - rc = shishi_key_random (sh, etype, &key); - if (rc != SHISHI_OK) - return EXIT_FAILURE; |
+ shishi_key_realm_set (key, realm); + shishi_key_principal_set (key, principal); |
|
- if (!args_info.quiet_flag) - shishi_key_print (sh, stdout, key); |
+ if (!args_info.quiet_flag) + shishi_key_print (sh, stdout, key); |
|
- dbkey->etype = etype; - dbkey->key = shishi_key_value (key); - dbkey->keylen = shishi_key_length (key); - dbkey->salt = salt; - dbkey->saltlen = strlen (salt); - dbkey->str2keyparam = str2keyparam; - dbkey->str2keyparamlen = str2keyparamlen; - dbkey->password = passwd; |
+ dbkey->etype = etype; + dbkey->key = shishi_key_value (key); + dbkey->keylen = shishi_key_length (key); + dbkey->salt = salt; + dbkey->saltlen = strlen (salt); + dbkey->str2keyparam = str2keyparam; + dbkey->str2keyparamlen = str2keyparamlen; + dbkey->password = passwd; + } |
return EXIT_SUCCESS; } |
Line 443 |
setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); |
- program_name = argv[0]; |
+ set_program_name (argv[0]); |
if (cmdline_parser (argc, argv, &args_info) != 0) { |
Line 463 |
args_info.modify_given + args_info.remove_given != 1) { cmdline_parser_print_help (); |
- printf("\nMandatory arguments to long options are " - "mandatory for short options too.\n\n" - "Report bugs to <%s>.\n", PACKAGE_BUGREPORT); |
+ printf ("\nMandatory arguments to long options are " + "mandatory for short options too.\n\n"); + printf ("Report bugs to <%s>.\n", PACKAGE_BUGREPORT); |
return 1; } |
- puts ("WARNING: The on-disk database format is not stable."); - puts ("WARNING: It will likely change in the next release."); - puts ("WARNING: The old format will not be recognized."); - puts (""); - |
rc = shisa_init_with_paths (&dbh, args_info.configuration_file_arg); if (rc != SHISA_OK) error (1, 0, "Initialization failed:\n%s", shisa_strerror (rc)); |
[Prev in Thread] | Current Thread | [Next in Thread] |