From: Russ Allbery <rra@stanford.edu>
Date: Mon, 30 Jun 2008 23:53:22 +0000 (+0000)
Subject: disconnected-merge-conflict-20080630
X-Git-Tag: openafs-devel-1_5_61~1009
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=99c1e0beb1b7aebfe7f3f10b73da8b6795d11464;p=packages%2Fo%2Fopenafs.git

disconnected-merge-conflict-20080630

LICENSE BSD

Fix a disconnected-mode merge conflict with an older import of disconnected
to HEAD that caused a duplicate definition of PDiscon.  I believe this
problem was only on HEAD.
---

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 83a8288a5..20a980755 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -3973,29 +3973,6 @@ DECL_PIOCTL(PCallBackAddr)
     return 0;
 }
 
-DECL_PIOCTL(PDiscon)
-{
-#ifdef AFS_DISCON_ENV
-    static afs_int32 mode;
-
-    if (ainSize == sizeof(afs_int32)) {
-	memcpy(&mode, ain, sizeof(afs_int32));
-
-	/* 3 is magic, should be a #define. */
-	afs_SetCheckServerNATmode(mode == 3);
-    } else if (ainSize != 0) {
-	return EINVAL;
-    }
-
-    /* Return new mode */
-    memcpy(aout, &mode, sizeof(afs_int32));
-    *aoutSize = sizeof(struct VenusFid);
-    return 0;
-#else
-    return EINVAL;
-#endif
-}
-
 DECL_PIOCTL(PDiscon)
 {
 #ifdef AFS_DISCON_ENV