Hello community, here is the log from the commit of package nfs-utils checked in at Fri Jun 2 13:18:09 CEST 2006. -------- --- nfs-utils/nfs-utils.changes 2006-05-02 09:40:22.000000000 +0200 +++ nfs-utils/nfs-utils.changes 2006-06-02 12:40:01.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 2 12:39:10 CEST 2006 - ro@suse.de + +- disable v4 support in rcnfsserver if NFS4_SUPPORT is + not set to "yes" (#178633) + +------------------------------------------------------------------- +Fri Jun 2 12:17:25 CEST 2006 - ro@suse.de + +- added fix for 64bit bigendian platforms in gssd (#172605) + +------------------------------------------------------------------- New: ---- nfs-utils-64bigendian.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.Wdt9lD/_old 2006-06-02 13:18:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Wdt9lD/_new 2006-06-02 13:18:00.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.0.7 -Release: 34 +Release: 36 Group: Productivity/Networking/NFS Obsoletes: knfsd linuxnfs nfsutils Provides: knfsd linuxnfs nfsutils @@ -49,6 +49,7 @@ Patch14: nfs-utils-1.0.7-CITI_NFS4_ALL-2.dif Patch15: nfs-utils-1.0.6-pie.patch Patch16: nfs-utils-1.0.7-strip.patch +Patch17: nfs-utils-64bigendian.patch %description This package contains the NFS utilities. You can tune the number of @@ -80,6 +81,7 @@ %patch14 -p1 %patch15 -p1 %patch16 +%patch17 -p1 %build %{?suse_update_config:%{suse_update_config -f }} @@ -204,6 +206,11 @@ %{_mandir}/man8/rpc.svcgssd.8.gz %changelog -n nfs-utils +* Fri Jun 02 2006 - ro@suse.de +- disable v4 support in rcnfsserver if NFS4_SUPPORT is + not set to "yes" (#178633) +* Fri Jun 02 2006 - ro@suse.de +- added fix for 64bit bigendian platforms in gssd (#172605) * Tue May 02 2006 - okir@suse.de - gracefully handle repeated "rcidmapd stop" calls (#169087) * Mon Apr 24 2006 - ro@suse.de ++++++ nfs-utils-64bigendian.patch ++++++ diff -Naurp nfs-utils-1.0.7.orig/utils/gssd/context.c nfs-utils-1.0.7/utils/gssd/context.c --- nfs-utils-1.0.7.orig/utils/gssd/context.c 2004-10-19 02:23:08.000000000 +0200 +++ nfs-utils-1.0.7/utils/gssd/context.c 2006-05-30 08:20:37.000000000 +0200 @@ -88,7 +88,7 @@ typedef struct _krb5_gss_ctx_id_rec { uint64_t seq_recv; /* gssint_uint64 */ void *seqstate; krb5_auth_context auth_context; - gss_buffer_desc *mech_used; /* gss_OID_desc */ + gss_OID_desc *mech_used; /* gss_OID_desc */ /* Protocol spec revision 0 => RFC 1964 with 3DES and RC4 enhancements 1 => draft-ietf-krb-wg-gssapi-cfx-01 @@ -125,7 +125,7 @@ typedef struct _krb5_gss_ctx_id_rec { int established; int big_endian; krb5_auth_context auth_context; - gss_buffer_desc *mech_used; + gss_OID_desc *mech_used; int nctypes; krb5_cksumtype *ctypes; } krb5_gss_ctx_id_rec, *krb5_gss_ctx_id_t; @@ -376,7 +376,7 @@ serialize_krb5_ctx(gss_ctx_id_t ctx, gss if (WRITE_BYTES(&p, end, kctx->endtime)) goto out_err; word_seq_send = kctx->seq_send; if (WRITE_BYTES(&p, end, word_seq_send)) goto out_err; - if (write_buffer(&p, end, kctx->mech_used)) goto out_err; + if (write_oid(&p, end, kctx->mech_used)) goto out_err; if (write_keyblock(&p, end, kctx->enc)) goto out_err; if (write_keyblock(&p, end, kctx->seq)) goto out_err; diff -Naurp nfs-utils-1.0.7.orig/utils/gssd/write_bytes.h nfs-utils-1.0.7/utils/gssd/write_bytes.h --- nfs-utils-1.0.7.orig/utils/gssd/write_bytes.h 2006-05-30 07:03:13.000000000 +0200 +++ nfs-utils-1.0.7/utils/gssd/write_bytes.h 2006-05-30 08:06:57.000000000 +0200 @@ -56,13 +56,26 @@ write_buffer(char **p, char *end, gss_bu int len = (int)arg->length; /* make an int out of size_t */ if (WRITE_BYTES(p, end, len)) return -1; - if (*p + arg->length > end) + if (*p + len > end) return -1; memcpy(*p, arg->value, len); *p += len; return 0; } +inline static int +write_oid(char **p, char *end, gss_OID_desc *arg) +{ + int len = (int)arg->length; /* make an int out of size_t */ + if(WRITE_BYTES(p, end, len)) + return -1; + if(*p + arg->length > end) + return -1; + memcpy(*p, arg->elements, len); + *p += len; + return 0; +} + static inline int get_bytes(char **ptr, const char *end, void *res, int len) { ++++++ nfsserver.init ++++++ --- nfs-utils/nfsserver.init 2006-04-24 14:57:56.000000000 +0200 +++ nfs-utils/nfsserver.init 2006-06-02 12:39:09.000000000 +0200 @@ -75,6 +75,11 @@ mount -t nfsd nfsd /proc/fs/nfsd rc_status fi + if [ "$NFS4_SUPPORT" = "yes" ]; then + echo "+2 +3 +4" > /proc/fs/nfsd/versions + else + echo "+2 +3 -4" > /proc/fs/nfsd/versions + fi /usr/sbin/exportfs -r rc_status /usr/sbin/rpc.nfsd $PARAMS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org