55dbaa49c0
Whether the log-file should be written to the filesystem or to shared memory must now be explicitly defined when calling skygw_logmanager_init() (instead of passing that via the argc/argv construct). Also, the meaning of '-l' when invoking maxscale has been changed. Earlier -l [file|shm] specified whether the trace and debug logs should be written to shared memory (while the error and message logs always were written to the filesystem) and the _default_ was to write them to shared memory. Now, with only one file, '-l' has still the same meaning, but it decides whether the one and only logfile should be written to shared memory, or the filesystem and the _default_ is to write it to the filesystem.
94 lines
2.2 KiB
C
94 lines
2.2 KiB
C
/*
|
|
* This file is distributed as part of the MariaDB Corporation MaxScale. It is free
|
|
* software: you can redistribute it and/or modify it under the terms of the
|
|
* GNU General Public License as published by the Free Software Foundation,
|
|
* version 2.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program; if not, write to the Free Software Foundation, Inc., 51
|
|
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright MariaDB Corporation Ab 2013-2014
|
|
*/
|
|
|
|
/**
|
|
* @file maxpasswd.c - Implementation of pasword encoding
|
|
*
|
|
* @verbatim
|
|
* Revision History
|
|
*
|
|
* Date Who Description
|
|
* 24/07/13 Mark Riddoch Initial implementation
|
|
*
|
|
* @endverbatim
|
|
*/
|
|
#include <stdio.h>
|
|
#include <secrets.h>
|
|
#include <skygw_utils.h>
|
|
#include <log_manager.h>
|
|
/**
|
|
* Encrypt a password for storing in the MaxScale.cnf file
|
|
*
|
|
* @param argc Argument count
|
|
* @param argv Argument vector
|
|
*/
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
char *enc;
|
|
char *pw;
|
|
int arg_count = 1;
|
|
char *home;
|
|
char** arg_vector;
|
|
int rval = 0;
|
|
|
|
if (argc != 3)
|
|
{
|
|
fprintf(stderr, "Usage: %s <file> <password>\n", argv[0]);
|
|
return 1;
|
|
}
|
|
|
|
arg_vector = malloc(sizeof(char*) * (arg_count + 1));
|
|
|
|
if (arg_vector == NULL)
|
|
{
|
|
fprintf(stderr,"Error: Memory allocation failed.\n");
|
|
return 1;
|
|
}
|
|
|
|
arg_vector[0] = "logmanager";
|
|
arg_vector[1] = NULL;
|
|
skygw_logmanager_init(NULL, LOG_TARGET_DEFAULT, arg_count, arg_vector);
|
|
free(arg_vector);
|
|
|
|
pw = calloc(81, sizeof(char));
|
|
|
|
if (pw == NULL)
|
|
{
|
|
fprintf(stderr, "Error: cannot allocate enough memory.");
|
|
return 1;
|
|
}
|
|
|
|
strncpy(pw, argv[2], 80);
|
|
|
|
if ((enc = encryptPassword(argv[1], pw)) != NULL)
|
|
{
|
|
printf("%s\n", enc);
|
|
}
|
|
else
|
|
{
|
|
fprintf(stderr, "Failed to encode the password\n");
|
|
rval = 1;
|
|
}
|
|
|
|
free(pw);
|
|
skygw_log_sync_all();
|
|
skygw_logmanager_done();
|
|
return rval;
|
|
}
|