Add --pwd-file option for reading password from file
This commit is contained in:
parent
194b0f1fef
commit
8df17dcef6
20
src/main.c
20
src/main.c
@ -350,6 +350,7 @@ int main(int argc, char *argv[]) {
|
|||||||
xmppc_mode_t mode = UNKOWN;
|
xmppc_mode_t mode = UNKOWN;
|
||||||
char *jid = NULL;
|
char *jid = NULL;
|
||||||
char *pwd = NULL;
|
char *pwd = NULL;
|
||||||
|
char *pwd_file = NULL;
|
||||||
char *account = NULL;
|
char *account = NULL;
|
||||||
|
|
||||||
static struct option long_options[] = {
|
static struct option long_options[] = {
|
||||||
@ -360,6 +361,7 @@ int main(int argc, char *argv[]) {
|
|||||||
{"account", required_argument, 0, 'a'},
|
{"account", required_argument, 0, 'a'},
|
||||||
{"jid", required_argument, 0, 'j'},
|
{"jid", required_argument, 0, 'j'},
|
||||||
{"pwd", required_argument, 0, 'p'},
|
{"pwd", required_argument, 0, 'p'},
|
||||||
|
{"pwd-file", required_argument, 0, 'P'},
|
||||||
{"mode", required_argument, 0, 'm'},
|
{"mode", required_argument, 0, 'm'},
|
||||||
{"file", required_argument, 0, 'f'},
|
{"file", required_argument, 0, 'f'},
|
||||||
{0, 0, 0, 0}};
|
{0, 0, 0, 0}};
|
||||||
@ -403,6 +405,11 @@ int main(int argc, char *argv[]) {
|
|||||||
strcpy(pwd, optarg);
|
strcpy(pwd, optarg);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'P':
|
||||||
|
pwd_file = malloc(strlen(optarg) + 1);
|
||||||
|
strcpy(pwd_file, optarg);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'm':
|
case 'm':
|
||||||
for(int i = 0; map[i].name;i++ ) {
|
for(int i = 0; map[i].name;i++ ) {
|
||||||
if (strcmp(optarg, map[i].name) == 0) {
|
if (strcmp(optarg, map[i].name) == 0) {
|
||||||
@ -449,6 +456,18 @@ int main(int argc, char *argv[]) {
|
|||||||
}
|
}
|
||||||
error = NULL;
|
error = NULL;
|
||||||
|
|
||||||
|
if (pwd_file) {
|
||||||
|
gchar *pwd_file_contents = NULL;
|
||||||
|
gsize pwd_file_length = 0;
|
||||||
|
gboolean pwd_file_read = g_file_get_contents(pwd_file, &pwd_file_contents, &pwd_file_length, &error);
|
||||||
|
if (!pwd_file_read) {
|
||||||
|
logError(&xmppc, "Error loading password file: %s\n", error->message);
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
pwd = g_strstrip(pwd_file_contents);
|
||||||
|
}
|
||||||
|
|
||||||
if(jid == NULL && pwd == NULL) {
|
if(jid == NULL && pwd == NULL) {
|
||||||
logInfo(&xmppc,"Loading default account\n");
|
logInfo(&xmppc,"Loading default account\n");
|
||||||
if( account == NULL ) {
|
if( account == NULL ) {
|
||||||
@ -544,6 +563,7 @@ static void _show_help() {
|
|||||||
printf(" -h / --help Display this information.\n");
|
printf(" -h / --help Display this information.\n");
|
||||||
printf(" -j / --jid <jid> Jabber ID\n");
|
printf(" -j / --jid <jid> Jabber ID\n");
|
||||||
printf(" -p / --pwd <password> Passwort\n");
|
printf(" -p / --pwd <password> Passwort\n");
|
||||||
|
printf(" --pwd-file <file> File containing passwort\n");
|
||||||
printf(" -a / --account <account> Account\n");
|
printf(" -a / --account <account> Account\n");
|
||||||
printf(" -m / --mode <mode> xmppc mode\n");
|
printf(" -m / --mode <mode> xmppc mode\n");
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user