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 83a8288a577815708c8f8d1dc55d4f92cc346eb0..20a98075501e1db80caa2718f552dca212feccf0 100644 (file)
--- 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