Whamcloud - gitweb
LU-9679 general: add missing spaces to folded strings.
[fs/lustre-release.git] / lustre / utils / gss / nfs-utils-1.0.10-lustre.diff
index 58f21fe..366d2d2 100644 (file)
@@ -2205,7 +2205,7 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/krb5_util.c nfs-utils-1.0.10.lustre/utils
 +                      ple = gssd_get_realm_ple((void *)&kte.principal->realm);
 +                      if (ple) {
 +                              if (ple->fl_mds) {
-+                                      printerr(2,"mds service entry: found a"
++                                      printerr(2,"mds service entry: found a "
 +                                               "duplicated one, it's like a "
 +                                               "mis-configuration, skip\n");
 +                                      goto next;
@@ -2341,10 +2341,8 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/krb5_util.h nfs-utils-1.0.10.lustre/utils
 diff -rNup nfs-utils-1.0.10/utils/gssd/lgss_keyring.c nfs-utils-1.0.10.lustre/utils/gssd/lgss_keyring.c
 --- nfs-utils-1.0.10/utils/gssd/lgss_keyring.c 1969-12-31 17:00:00.000000000 -0700
 +++ nfs-utils-1.0.10.lustre/utils/gssd/lgss_keyring.c  2007-05-15 13:01:35.000000000 -0600
-@@ -0,0 +1,778 @@
-+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
-+ * vim:expandtab:shiftwidth=8:tabstop=8:
-+ *
+@@ -0,0 +1,776 @@
++/*
 + *  lucall_keyring.c
 + *  user-space upcall to create GSS context, using keyring interface to kernel
 + *
@@ -3164,10 +3162,8 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/l_idmap.c nfs-utils-1.0.10.lustre/utils/g
 diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.c nfs-utils-1.0.10.lustre/utils/gssd/lsupport.c
 --- nfs-utils-1.0.10/utils/gssd/lsupport.c     1969-12-31 17:00:00.000000000 -0700
 +++ nfs-utils-1.0.10.lustre/utils/gssd/lsupport.c      2007-05-15 13:01:35.000000000 -0600
-@@ -0,0 +1,783 @@
-+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
-+ * vim:expandtab:shiftwidth=8:tabstop=8:
-+ *
+@@ -0,0 +1,781 @@
++/*
 + *  Copyright (c) 2005 Cluster File Systems, Inc.
 + *
 + *   This file is part of Lustre, http://www.lustre.org.
@@ -3951,11 +3947,7 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.c nfs-utils-1.0.10.lustre/utils/
 diff -rNup nfs-utils-1.0.10/utils/gssd/lsupport.h nfs-utils-1.0.10.lustre/utils/gssd/lsupport.h
 --- nfs-utils-1.0.10/utils/gssd/lsupport.h     1969-12-31 17:00:00.000000000 -0700
 +++ nfs-utils-1.0.10.lustre/utils/gssd/lsupport.h      2007-05-15 13:01:35.000000000 -0600
-@@ -0,0 +1,89 @@
-+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
-+ * vim:expandtab:shiftwidth=8:tabstop=8:
-+ */
-+
+@@ -0,0 +1,85 @@
 +#ifndef __LIBCFS_H__
 +#define __LIBCFS_H__
 +