Updated to the latest RC release: nfs-utils-1-3-4-rc2
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson
parent
f8c8e2f58c
commit
55621f8a86
@ -1,335 +0,0 @@
|
||||
diff --git a/utils/gssd/context_heimdal.c b/utils/gssd/context_heimdal.c
|
||||
index 1e8738a..d07103b 100644
|
||||
--- a/utils/gssd/context_heimdal.c
|
||||
+++ b/utils/gssd/context_heimdal.c
|
||||
@@ -260,7 +260,7 @@ serialize_krb5_ctx(gss_ctx_id_t *_ctx, gss_buffer_desc *buf, int32_t *endtime)
|
||||
if (write_heimdal_seq_key(&p, end, ctx)) goto out_err;
|
||||
|
||||
buf->length = p - (char *)buf->value;
|
||||
- printerr(2, "serialize_krb5_ctx: returning buffer "
|
||||
+ printerr(4, "serialize_krb5_ctx: returning buffer "
|
||||
"with %d bytes\n", buf->length);
|
||||
|
||||
return 0;
|
||||
diff --git a/utils/gssd/context_lucid.c b/utils/gssd/context_lucid.c
|
||||
index badbe88..5d77c21 100644
|
||||
--- a/utils/gssd/context_lucid.c
|
||||
+++ b/utils/gssd/context_lucid.c
|
||||
@@ -206,7 +206,7 @@ prepare_krb5_rfc4121_buffer(gss_krb5_lucid_context_v1_t *lctx,
|
||||
if (WRITE_BYTES(&p, end, lctx->send_seq)) goto out_err;
|
||||
|
||||
/* Protocol 0 here implies DES3 or RC4 */
|
||||
- printerr(2, "%s: protocol %d\n", __FUNCTION__, lctx->protocol);
|
||||
+ printerr(4, "%s: protocol %d\n", __FUNCTION__, lctx->protocol);
|
||||
if (lctx->protocol == 0) {
|
||||
enctype = lctx->rfc1964_kd.ctx_key.type;
|
||||
keysize = lctx->rfc1964_kd.ctx_key.length;
|
||||
@@ -219,7 +219,7 @@ prepare_krb5_rfc4121_buffer(gss_krb5_lucid_context_v1_t *lctx,
|
||||
keysize = lctx->cfx_kd.ctx_key.length;
|
||||
}
|
||||
}
|
||||
- printerr(2, "%s: serializing key with enctype %d and size %d\n",
|
||||
+ printerr(4, "%s: serializing key with enctype %d and size %d\n",
|
||||
__FUNCTION__, enctype, keysize);
|
||||
|
||||
if (WRITE_BYTES(&p, end, enctype)) goto out_err;
|
||||
@@ -265,7 +265,7 @@ serialize_krb5_ctx(gss_ctx_id_t *ctx, gss_buffer_desc *buf, int32_t *endtime)
|
||||
gss_krb5_lucid_context_v1_t *lctx = 0;
|
||||
int retcode = 0;
|
||||
|
||||
- printerr(2, "DEBUG: %s: lucid version!\n", __FUNCTION__);
|
||||
+ printerr(4, "DEBUG: %s: lucid version!\n", __FUNCTION__);
|
||||
maj_stat = gss_export_lucid_sec_context(&min_stat, ctx,
|
||||
1, &return_ctx);
|
||||
if (maj_stat != GSS_S_COMPLETE) {
|
||||
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
|
||||
index 078e558..e7cb07f 100644
|
||||
--- a/utils/gssd/gssd.c
|
||||
+++ b/utils/gssd/gssd.c
|
||||
@@ -556,7 +556,7 @@ gssd_scan_topdir(const char *name)
|
||||
if (clp->scanned)
|
||||
continue;
|
||||
|
||||
- printerr(2, "destroying client %s\n", clp->relpath);
|
||||
+ printerr(3, "destroying client %s\n", clp->relpath);
|
||||
saveprev = clp->list.tqe_prev;
|
||||
TAILQ_REMOVE(&tdi->clnt_list, clp, list);
|
||||
gssd_destroy_client(clp);
|
||||
@@ -716,7 +716,7 @@ gssd_inotify_cb(int ifd, short UNUSED(which), void *UNUSED(data))
|
||||
|
||||
found:
|
||||
if (!tdi) {
|
||||
- printerr(1, "inotify event for unknown wd!!! - "
|
||||
+ printerr(5, "inotify event for unknown wd!!! - "
|
||||
"ev->wd (%d) ev->name (%s) ev->mask (0x%08x)\n",
|
||||
ev->wd, ev->len > 0 ? ev->name : "<?>", ev->mask);
|
||||
rescan = true;
|
||||
@@ -820,7 +820,7 @@ main(int argc, char *argv[])
|
||||
* the results of getpw*.
|
||||
*/
|
||||
if (setenv("HOME", "/", 1)) {
|
||||
- printerr(1, "Unable to set $HOME: %s\n", strerror(errno));
|
||||
+ printerr(0, "gssd: Unable to set $HOME: %s\n", strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -891,19 +891,19 @@ main(int argc, char *argv[])
|
||||
|
||||
pipefs_dir = opendir(pipefs_path);
|
||||
if (!pipefs_dir) {
|
||||
- printerr(1, "ERROR: opendir(%s) failed: %s\n", pipefs_path, strerror(errno));
|
||||
+ printerr(0, "ERROR: opendir(%s) failed: %s\n", pipefs_path, strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
pipefs_fd = dirfd(pipefs_dir);
|
||||
if (fchdir(pipefs_fd)) {
|
||||
- printerr(1, "ERROR: fchdir(%s) failed: %s\n", pipefs_path, strerror(errno));
|
||||
+ printerr(0, "ERROR: fchdir(%s) failed: %s\n", pipefs_path, strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
inotify_fd = inotify_init1(IN_NONBLOCK);
|
||||
if (inotify_fd == -1) {
|
||||
- printerr(1, "ERROR: inotify_init1 failed: %s\n", strerror(errno));
|
||||
+ printerr(0, "ERROR: inotify_init1 failed: %s\n", strerror(errno));
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@@ -920,7 +920,7 @@ main(int argc, char *argv[])
|
||||
|
||||
event_dispatch();
|
||||
|
||||
- printerr(1, "ERROR: event_dispatch() returned!\n");
|
||||
+ printerr(0, "ERROR: event_dispatch() returned!\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
|
||||
index cee8991..1ef68d8 100644
|
||||
--- a/utils/gssd/gssd_proc.c
|
||||
+++ b/utils/gssd/gssd_proc.c
|
||||
@@ -150,7 +150,7 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
|
||||
unsigned int timeout = context_timeout;
|
||||
unsigned int buf_size = 0;
|
||||
|
||||
- printerr(1, "doing downcall: lifetime_rec=%u acceptor=%.*s\n",
|
||||
+ printerr(2, "doing downcall: lifetime_rec=%u acceptor=%.*s\n",
|
||||
lifetime_rec, acceptor->length, acceptor->value);
|
||||
buf_size = sizeof(uid) + sizeof(timeout) + sizeof(pd->pd_seq_win) +
|
||||
sizeof(pd->pd_ctx_hndl.length) + pd->pd_ctx_hndl.length +
|
||||
@@ -189,7 +189,7 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
|
||||
unsigned int timeout = 0;
|
||||
int zero = 0;
|
||||
|
||||
- printerr(1, "doing error downcall\n");
|
||||
+ printerr(2, "doing error downcall\n");
|
||||
|
||||
if (WRITE_BYTES(&p, end, uid)) goto out_err;
|
||||
if (WRITE_BYTES(&p, end, timeout)) goto out_err;
|
||||
@@ -231,7 +231,7 @@ populate_port(struct sockaddr *sa, const socklen_t salen,
|
||||
switch (sa->sa_family) {
|
||||
case AF_INET:
|
||||
if (s4->sin_port != 0) {
|
||||
- printerr(2, "DEBUG: port already set to %d\n",
|
||||
+ printerr(4, "DEBUG: port already set to %d\n",
|
||||
ntohs(s4->sin_port));
|
||||
return 1;
|
||||
}
|
||||
@@ -239,7 +239,7 @@ populate_port(struct sockaddr *sa, const socklen_t salen,
|
||||
#ifdef IPV6_SUPPORTED
|
||||
case AF_INET6:
|
||||
if (s6->sin6_port != 0) {
|
||||
- printerr(2, "DEBUG: port already set to %d\n",
|
||||
+ printerr(4, "DEBUG: port already set to %d\n",
|
||||
ntohs(s6->sin6_port));
|
||||
return 1;
|
||||
}
|
||||
@@ -393,7 +393,7 @@ create_auth_rpc_client(struct clnt_info *clp,
|
||||
auth = authgss_create_default(rpc_clnt, tgtname, &sec);
|
||||
if (!auth) {
|
||||
/* Our caller should print appropriate message */
|
||||
- printerr(2, "WARNING: Failed to create krb5 context for "
|
||||
+ printerr(1, "WARNING: Failed to create krb5 context for "
|
||||
"user with uid %d for server %s\n",
|
||||
uid, tgtname);
|
||||
goto out_fail;
|
||||
@@ -484,7 +484,7 @@ krb5_not_machine_creds(struct clnt_info *clp, uid_t uid, char *tgtname,
|
||||
char **dname;
|
||||
int err, resp = -1;
|
||||
|
||||
- printerr(1, "krb5_not_machine_creds: uid %d tgtname %s\n",
|
||||
+ printerr(2, "krb5_not_machine_creds: uid %d tgtname %s\n",
|
||||
uid, tgtname);
|
||||
|
||||
*chg_err = change_identity(uid);
|
||||
@@ -531,7 +531,7 @@ krb5_use_machine_creds(struct clnt_info *clp, uid_t uid, char *tgtname,
|
||||
int nocache = 0;
|
||||
int success = 0;
|
||||
|
||||
- printerr(1, "krb5_use_machine_creds: uid %d tgtname %s\n",
|
||||
+ printerr(2, "krb5_use_machine_creds: uid %d tgtname %s\n",
|
||||
uid, tgtname);
|
||||
|
||||
do {
|
||||
@@ -601,8 +601,6 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
|
||||
gss_OID mech;
|
||||
gss_buffer_desc acceptor = {0};
|
||||
|
||||
- printerr(1, "handling krb5 upcall (%s)\n", clp->relpath);
|
||||
-
|
||||
token.length = 0;
|
||||
token.value = NULL;
|
||||
memset(&pd, 0, sizeof(struct authgss_private_data));
|
||||
@@ -628,8 +626,6 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
|
||||
* used for this case is not important.
|
||||
*
|
||||
*/
|
||||
- printerr(2, "%s: service is '%s'\n", __func__,
|
||||
- service ? service : "<null>");
|
||||
if (uid != 0 || (uid == 0 && root_uses_machine_creds == 0 &&
|
||||
service == NULL)) {
|
||||
|
||||
@@ -643,7 +639,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
|
||||
/* Child: fall through to rest of function */
|
||||
childpid = getpid();
|
||||
unsetenv("KRB5CCNAME");
|
||||
- printerr(1, "CHILD forked pid %d \n", childpid);
|
||||
+ printerr(2, "CHILD forked pid %d \n", childpid);
|
||||
break;
|
||||
case -1:
|
||||
/* fork() failed! */
|
||||
@@ -676,9 +672,7 @@ no_fork:
|
||||
if (auth == NULL)
|
||||
goto out_return_error;
|
||||
} else {
|
||||
- printerr(1, "WARNING: Failed to create krb5 context "
|
||||
- "for user with uid %d for server %s\n",
|
||||
- uid, clp->servername);
|
||||
+ /* krb5_not_machine_creds logs the error */
|
||||
goto out_return_error;
|
||||
}
|
||||
}
|
||||
@@ -709,7 +703,7 @@ no_fork:
|
||||
* try to use it after this point.
|
||||
*/
|
||||
if (serialize_context_for_kernel(&pd.pd_ctx, &token, &krb5oid, NULL)) {
|
||||
- printerr(0, "WARNING: Failed to serialize krb5 context for "
|
||||
+ printerr(1, "WARNING: Failed to serialize krb5 context for "
|
||||
"user with uid %d for server %s\n",
|
||||
uid, clp->servername);
|
||||
goto out_return_error;
|
||||
@@ -752,6 +746,8 @@ handle_krb5_upcall(struct clnt_info *clp)
|
||||
return;
|
||||
}
|
||||
|
||||
+ printerr(2, "\n%s: uid %d (%s)\n", __func__, uid, clp->relpath);
|
||||
+
|
||||
process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
|
||||
}
|
||||
|
||||
@@ -768,8 +764,6 @@ handle_gssd_upcall(struct clnt_info *clp)
|
||||
char *service = NULL;
|
||||
char *enctypes = NULL;
|
||||
|
||||
- printerr(1, "handling gssd upcall (%s)\n", clp->relpath);
|
||||
-
|
||||
lbuflen = read(clp->gssd_fd, lbuf, sizeof(lbuf));
|
||||
if (lbuflen <= 0 || lbuf[lbuflen-1] != '\n') {
|
||||
printerr(0, "WARNING: handle_gssd_upcall: "
|
||||
@@ -778,7 +772,7 @@ handle_gssd_upcall(struct clnt_info *clp)
|
||||
}
|
||||
lbuf[lbuflen-1] = 0;
|
||||
|
||||
- printerr(2, "%s: '%s'\n", __func__, lbuf);
|
||||
+ printerr(2, "\n%s: '%s' (%s)\n", __func__, lbuf, clp->relpath);
|
||||
|
||||
for (p = strtok(lbuf, " "); p; p = strtok(NULL, " ")) {
|
||||
if (!strncmp(p, "mech=", strlen("mech=")))
|
||||
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
|
||||
index f48de2c..8ef8184 100644
|
||||
--- a/utils/gssd/krb5_util.c
|
||||
+++ b/utils/gssd/krb5_util.c
|
||||
@@ -356,7 +356,7 @@ gssd_get_single_krb5_cred(krb5_context context,
|
||||
*/
|
||||
now += 300;
|
||||
if (ple->ccname && ple->endtime > now && !nocache) {
|
||||
- printerr(2, "INFO: Credentials in CC '%s' are good until %d\n",
|
||||
+ printerr(3, "INFO: Credentials in CC '%s' are good until %d\n",
|
||||
ple->ccname, ple->endtime);
|
||||
code = 0;
|
||||
goto out;
|
||||
@@ -383,7 +383,7 @@ gssd_get_single_krb5_cred(krb5_context context,
|
||||
"tickets. May have problems behind a NAT.\n");
|
||||
#ifdef TEST_SHORT_LIFETIME
|
||||
/* set a short lifetime (for debugging only!) */
|
||||
- printerr(0, "WARNING: Using (debug) short machine cred lifetime!\n");
|
||||
+ printerr(1, "WARNING: Using (debug) short machine cred lifetime!\n");
|
||||
krb5_get_init_creds_opt_set_tkt_life(init_opts, 5*60);
|
||||
#endif
|
||||
opts = init_opts;
|
||||
@@ -451,8 +451,7 @@ gssd_get_single_krb5_cred(krb5_context context,
|
||||
}
|
||||
|
||||
code = 0;
|
||||
- printerr(2, "Successfully obtained machine credentials for "
|
||||
- "principal '%s' stored in ccache '%s'\n", pname, cc_name);
|
||||
+ printerr(2, "%s: principal '%s' ccache:'%s'\n", __func__, pname, cc_name);
|
||||
out:
|
||||
#if HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
|
||||
if (init_opts)
|
||||
@@ -477,7 +476,7 @@ gssd_set_krb5_ccache_name(char *ccname)
|
||||
#ifdef USE_GSS_KRB5_CCACHE_NAME
|
||||
u_int maj_stat, min_stat;
|
||||
|
||||
- printerr(2, "using gss_krb5_ccache_name to select krb5 ccache %s\n",
|
||||
+ printerr(3, "using gss_krb5_ccache_name to select krb5 ccache %s\n",
|
||||
ccname);
|
||||
maj_stat = gss_krb5_ccache_name(&min_stat, ccname, NULL);
|
||||
if (maj_stat != GSS_S_COMPLETE) {
|
||||
@@ -492,7 +491,7 @@ gssd_set_krb5_ccache_name(char *ccname)
|
||||
* function above for which there is no generic gssapi
|
||||
* equivalent.)
|
||||
*/
|
||||
- printerr(2, "using environment variable to select krb5 ccache %s\n",
|
||||
+ printerr(3, "using environment variable to select krb5 ccache %s\n",
|
||||
ccname);
|
||||
setenv("KRB5CCNAME", ccname, 1);
|
||||
#endif
|
||||
@@ -1093,8 +1092,8 @@ gssd_setup_krb5_user_gss_ccache(uid_t uid, char *servername, char *dirpattern)
|
||||
struct dirent *d;
|
||||
int err, i, j;
|
||||
|
||||
- printerr(2, "getting credentials for client with uid %u for "
|
||||
- "server %s\n", uid, servername);
|
||||
+ printerr(3, "looking for client creds with uid %u for "
|
||||
+ "server %s in %s\n", uid, servername, dirpattern);
|
||||
|
||||
for (i = 0, j = 0; dirpattern[i] != '\0'; i++) {
|
||||
switch (dirpattern[i]) {
|
||||
@@ -1410,16 +1409,21 @@ gssd_acquire_krb5_cred(gss_cred_id_t *gss_cred)
|
||||
int
|
||||
gssd_acquire_user_cred(gss_cred_id_t *gss_cred)
|
||||
{
|
||||
- OM_uint32 min_stat;
|
||||
+ OM_uint32 maj_stat, min_stat;
|
||||
int ret;
|
||||
|
||||
ret = gssd_acquire_krb5_cred(gss_cred);
|
||||
|
||||
/* force validation of cred to check for expiry */
|
||||
if (ret == 0) {
|
||||
- if (gss_inquire_cred(&min_stat, *gss_cred, NULL, NULL,
|
||||
- NULL, NULL) != GSS_S_COMPLETE)
|
||||
- ret = -1;
|
||||
+ maj_stat = gss_inquire_cred(&min_stat, *gss_cred,
|
||||
+ NULL, NULL, NULL, NULL);
|
||||
+ if (maj_stat != GSS_S_COMPLETE) {
|
||||
+ if (get_verbosity() > 0)
|
||||
+ pgsserr("gss_inquire_cred",
|
||||
+ maj_stat, min_stat, &krb5oid);
|
||||
+ ret = -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
return ret;
|
||||
@ -1,24 +0,0 @@
|
||||
diff -up nfs-utils-1.3.3/systemd/nfs-server.service.orig nfs-utils-1.3.3/systemd/nfs-server.service
|
||||
--- nfs-utils-1.3.3/systemd/nfs-server.service.orig 2015-09-26 10:01:11.000000000 -0400
|
||||
+++ nfs-utils-1.3.3/systemd/nfs-server.service 2015-11-09 12:16:39.452907289 -0500
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=NFS server and services
|
||||
DefaultDependencies=no
|
||||
-Requires= network.target proc-fs-nfsd.mount rpcbind.service
|
||||
+Requires= network.target proc-fs-nfsd.mount rpcbind.target
|
||||
Requires= nfs-mountd.service
|
||||
Wants=rpc-statd.service nfs-idmapd.service
|
||||
Wants=rpc-statd-notify.service
|
||||
diff -up nfs-utils-1.3.3/systemd/rpc-statd.service.orig nfs-utils-1.3.3/systemd/rpc-statd.service
|
||||
--- nfs-utils-1.3.3/systemd/rpc-statd.service.orig 2015-11-09 12:16:39.452907289 -0500
|
||||
+++ nfs-utils-1.3.3/systemd/rpc-statd.service 2015-11-09 12:17:30.891285825 -0500
|
||||
@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2
|
||||
DefaultDependencies=no
|
||||
Conflicts=umount.target
|
||||
Requires=nss-lookup.target rpcbind.target
|
||||
-After=network.target nss-lookup.target rpcbind.target
|
||||
+After=network.target nss-lookup.target rpcbind.service
|
||||
|
||||
PartOf=nfs-utils.service
|
||||
|
||||
1272
nfs-utils-1.3.4-rc2.patch
Normal file
1272
nfs-utils-1.3.4-rc2.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
|
||||
Name: nfs-utils
|
||||
URL: http://sourceforge.net/projects/nfs
|
||||
Version: 1.3.3
|
||||
Release: 4.rc1%{?dist}
|
||||
Release: 5.rc2%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# group all 32bit related archs
|
||||
@ -15,9 +15,7 @@ Source2: nfs.sysconfig
|
||||
Source3: nfs-utils_env.sh
|
||||
Source4: lockd.conf
|
||||
|
||||
Patch001: nfs-utils-1.3.4-rc1.patch
|
||||
Patch002: nfs-utils-1.3.3-systemd-decouple.patch
|
||||
Patch003: nfs-utils-1.3.3-gssd-debug.patch
|
||||
Patch001: nfs-utils-1.3.4-rc2.patch
|
||||
|
||||
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
||||
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
||||
@ -77,8 +75,6 @@ This package also contains the mount.nfs and umount.nfs program.
|
||||
%setup -q
|
||||
|
||||
%patch001 -p1
|
||||
%patch002 -p1
|
||||
%patch003 -p1
|
||||
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
@ -295,6 +291,9 @@ fi
|
||||
/sbin/umount.nfs4
|
||||
|
||||
%changelog
|
||||
* Fri Dec 11 2015 Steve Dickson <steved@redhat.com> 1.3.3-5.rc2
|
||||
- Updated to the latest RC release: nfs-utils-1-3-4-rc2
|
||||
|
||||
* Tue Nov 17 2015 Steve Dickson <steved@redhat.com> 1.3.3-4.rc1
|
||||
- ghost-ed rpc.statd state file (bz 1158466)
|
||||
|
||||
@ -310,7 +309,7 @@ fi
|
||||
* Wed Nov 4 2015 Steve Dickson <steved@redhat.com> 1.3.3-1.rc1
|
||||
- Updated to the latest RC release: nfs-utils-1-3-4-rc1
|
||||
|
||||
* Wed Nov 3 2015 Steve Dickson <steved@redhat.com> 1.3.3-1
|
||||
* Tue Nov 3 2015 Steve Dickson <steved@redhat.com> 1.3.3-1
|
||||
- Removed legacy triggers to remove rpm build errors
|
||||
|
||||
* Mon Nov 2 2015 Steve Dickson <steved@redhat.com> 1.3.3-0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user