commit wsmancli for openSUSE:Factory
Hello community,
here is the log from the commit of package wsmancli for openSUSE:Factory checked in at 2014-02-28 21:17:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wsmancli (Old)
and /work/SRC/openSUSE:Factory/.wsmancli.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wsmancli"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wsmancli/wsmancli.changes 2014-02-21 06:58:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.wsmancli.new/wsmancli.changes 2014-02-28 21:17:26.000000000 +0100
@@ -2 +2 @@
-Thu Feb 13 11:31:14 UTC 2014 - kkaempf@suse.com
+Wed Feb 26 14:42:15 UTC 2014 - kkaempf@suse.com
@@ -6,0 +7,6 @@
+ - read credentials from environment
+ wsman: WSMAN_USER, WSMAN_PASS, WSMAN_EVENT_USER, WSMAN_EVENT_PASS
+ wseventmgr: WSEVENTMGR_USER, WSEVENTMGR_PASS,
+ WSEVENTMGR_EVENT_USER, WSEVENTMGR_EVENT_PASS
+ - add --non-interactive option to prevent asking for credentials
+ in scripts
Old:
----
wsmancli-2.3.0.tar.bz2
wsmancli_2.3.0-0ubuntu4.debian.tar.gz
wsmancli_2.3.0-0ubuntu4.dsc
New:
----
wsmancli_2.3.0-0ubuntu4~precise1~ppa1.debian.tar.gz
wsmancli_2.3.0-0ubuntu4~precise1~ppa1.dsc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wsmancli-2.3.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/ChangeLog new/wsmancli-2.3.1/ChangeLog
--- old/wsmancli-2.3.1/ChangeLog 2014-02-13 12:35:34.000000000 +0100
+++ new/wsmancli-2.3.1/ChangeLog 2014-02-26 10:08:40.000000000 +0100
@@ -1,6 +1,10 @@
Version 2.3.1
- exit with non-zero code if connection fails
- man pages (Kent Baxley)
+ - read credentials from environment
+ wsman: WSMAN_USER, WSMAN_PASS, WSMAN_EVENT_USER, WSMAN_EVENT_PASS
+ wseventmgr: WSEVENTMGR_USER, WSEVENTMGR_PASS, WSEVENTMGR_EVENT_USER, WSEVENTMGR_EVENT_PASS
+ - add --non-interactive cli parameter to prevent asking for credentials
Version 2.3.0
- don't crash on filter parse error (Zoltan Micskei)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/man/wseventmgr.1 new/wsmancli-2.3.1/man/wseventmgr.1
--- old/wsmancli-2.3.1/man/wseventmgr.1 2014-02-13 12:16:18.000000000 +0100
+++ new/wsmancli-2.3.1/man/wseventmgr.1 2014-02-24 12:48:41.000000000 +0100
@@ -39,12 +39,16 @@
.TP
\fB\-u\fR, \fB\-\-username=\fR<username>
User name
+Can also be passed by setting the WSEVENTMGR_USER environment variable. The
+command line option takes precedence.
.TP
\fB\-g\fR, \fB\-\-path=\fR<path>
Path
.TP
\fB\-p\fR, \fB\-\-password=\fR<password>
Password
+Can also be passed by setting the WSEVENTMGR_PASS environment variable. The
+command line option takes precedence.
.TP
\fB\-h\fR, \fB\-\-hostname=\fR<hostname>
Host name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/man/wsman.1 new/wsmancli-2.3.1/man/wsman.1
--- old/wsmancli-2.3.1/man/wsman.1 2014-02-13 12:16:18.000000000 +0100
+++ new/wsmancli-2.3.1/man/wsman.1 2014-02-26 10:13:29.000000000 +0100
@@ -31,6 +31,9 @@
.PP
Application Options
.TP
+\fB\-q\fR, \fB\-\-non-interactive\fR
+Don't ask for credentials interactively
+.TP
\fB\-q\fR, \fB\-\-version\fR
Display application version
.TP
@@ -51,6 +54,8 @@
.TP
\fB\-u\fR, \fB\-\-username=\fR<username>
User name
+Can also be passed by setting the WSMAN_USER environment variable. The
+command line option takes precedence.
.TP
\fB\-g\fR, \fB\-\-path=\fR<path>
Service Path (default: 'wsman')
@@ -60,6 +65,8 @@
.TP
\fB\-p\fR, \fB\-\-password=\fR<password>
User Password
+Can also be passed by setting the WSMAN_PASS environment variable. The
+command line option takes precedence.
.TP
\fB\-h\fR, \fB\-\-hostname=\fR<hostname>
Host name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/src/wseventmgr.c new/wsmancli-2.3.1/src/wseventmgr.c
--- old/wsmancli-2.3.1/src/wseventmgr.c 2014-01-30 15:59:38.000000000 +0100
+++ new/wsmancli-2.3.1/src/wseventmgr.c 2014-02-24 12:50:07.000000000 +0100
@@ -413,6 +413,15 @@
char *resource_uri = NULL;
char subscontext[512];
filter_t *filter = NULL;
+
+ /* read credentials from environment */
+ username = getenv("WSEVENTMGR_USER");
+ password = getenv("WSEVENTMGR_PASS");
+ event_username = getenv("WSEVENTMGR_EVENT_USER");
+ event_password = getenv("WSEVENTMGR_EVENT_PASS");
+
+ /* parse command line options
+ might overwrite environment credentials */
if (!wsman_parse_options(argc, argv)) {
exit(EXIT_FAILURE);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/src/wsman.c new/wsmancli-2.3.1/src/wsman.c
--- old/wsmancli-2.3.1/src/wsman.c 2014-01-30 16:00:17.000000000 +0100
+++ new/wsmancli-2.3.1/src/wsman.c 2014-02-26 10:11:47.000000000 +0100
@@ -76,6 +76,7 @@
static char *proxy_upwd = NULL;
+static long int non_interactive = 0;
static long int debug_level = -1;
static char *encoding = NULL;
static char *test_case = NULL;
@@ -181,6 +182,8 @@
char my_version = 0;
u_option_entry_t options[] = {
+ {"non-interactive", 0, U_OPTION_ARG_NONE, &non_interactive,
+ "Non interactive mode, don't ask for credentials", NULL},
{"version", 'q', U_OPTION_ARG_NONE, &my_version,
"Display application version", NULL},
{"debug", 'd', U_OPTION_ARG_INT, &debug_level,
@@ -632,6 +635,18 @@
char subscontext[512];
filter_t *filter = NULL;
+ /* read credentials from environment */
+ username = getenv("WSMAN_USER");
+ password = getenv("WSMAN_PASS");
+ event_username = getenv("WSMAN_EVENT_USER");
+ event_password = getenv("WSMAN_EVENT_PASS");
+
+ /* parse command line options
+ might overwrite environment credentials */
+
+ if (!wsman_parse_options(argc, argv)) {
+ exit(EXIT_FAILURE);
+ }
filename = (char *) config_file;
@@ -646,9 +661,6 @@
exit(EXIT_FAILURE);
}
}
- if (!wsman_parse_options(argc, argv)) {
- exit(EXIT_FAILURE);
- }
initialize_logging();
// wsmc_transport_init(NULL);
options = wsmc_options_init();
@@ -666,8 +678,9 @@
password);
}
- wsmc_transport_set_auth_request_func(cl , &request_usr_pwd );
-
+ if (non_interactive == 0) {
+ wsmc_transport_set_auth_request_func(cl , &request_usr_pwd );
+ }
if (cl == NULL) {
error("Null Client");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wsmancli-2.3.1/tests/cunit/common.c new/wsmancli-2.3.1/tests/cunit/common.c
--- old/wsmancli-2.3.1/tests/cunit/common.c 2014-01-30 15:59:38.000000000 +0100
+++ new/wsmancli-2.3.1/tests/cunit/common.c 2014-02-24 12:52:16.000000000 +0100
@@ -39,8 +39,8 @@
int clean_test(void) {
- wsmc_release(cl);
wsmc_transport_fini(cl);
+ wsmc_release(cl);
return 0;
}
++++++ wsmancli_2.3.0-0ubuntu4~precise1~ppa1.dsc ++++++
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 3.0 (quilt)
Source: wsmancli
Binary: wsmancli
Architecture: any
Version: 2.3.0-0ubuntu4~precise1~ppa1
Maintainer: Ubuntu Developers
participants (1)
-
root@hilbert.suse.de