b=22781 fix the waiting time/race of identity upcall.

[fs/lustre-release.git] / lustre / utils / l_getidentity.c

diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c
index e503230..ee4b645 100644 (file)
--- a/lustre/utils/l_getidentity.c
+++ b/lustre/utils/l_getidentity.c
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -89,11 +89,10 @@ static void errlog(const char *fmt, ...)
 {
         va_list args;
 
-        openlog(progname, LOG_PERROR, LOG_AUTHPRIV);
+        openlog(progname, LOG_PERROR | LOG_PID, LOG_AUTHPRIV);
 
         va_start(args, fmt);
         vsyslog(LOG_NOTICE, fmt, args);
-        fprintf(stderr, fmt, args);
         va_end(args);
 
         closelog();
@@ -194,6 +193,7 @@ static perm_type_t perm_types[] = {
         { "setgid", CFS_SETGID_PERM },
         { "setgrp", CFS_SETGRP_PERM },
         { "rmtacl", CFS_RMTACL_PERM },
+        { "rmtown", CFS_RMTOWN_PERM },
         { 0 }
 };
 
@@ -202,6 +202,7 @@ static perm_type_t noperm_types[] = {
         { "nosetgid", CFS_SETGID_PERM },
         { "nosetgrp", CFS_SETGRP_PERM },
         { "normtacl", CFS_RMTACL_PERM },
+        { "normtown", CFS_RMTOWN_PERM },
         { 0 }
 };