Fix -exit patch rebasing mistake

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 8a5a5357d0fe045413585d1253a932655baac995..7de6855310cad3a1172aa02a055c6de5d6d9cfe5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openafs (1.6.21-2) UNRELEASED; urgency=medium
   * debian/patches:
     - AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch: Use UTC
       for better reproducibility.
+    - 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch: Fix
+      rebasing mistake so -exit works correctly.
 
  -- Anders Kaseorg <andersk@mit.edu>  Tue, 22 Aug 2017 17:22:44 -0400
 

diff --git a/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch b/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
index f0ecab395b6f31f5c033da799453c35404343fbc..e17d0f0db9a8a977f342ffc1d2950d77f602952a 100644 (file)
--- a/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
+++ b/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
@@ -3,25 +3,26 @@ Date: Thu, 23 Oct 2014 17:28:43 -0400
 Subject: Add dummy -exit command for afsd to do nothing
 
 ---
- src/afsd/afsd.c | 5 +++++
- 1 file changed, 5 insertions(+)
+ src/afsd/afsd.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
-index 2f0478d..4067919 100644
+index 2f0478db19..a667719291 100644
 --- a/src/afsd/afsd.c
 +++ b/src/afsd/afsd.c
-@@ -1913,6 +1913,10 @@ mainproc(struct cmd_syndesc *as, void *arock)
-       /* -rxmaxfrags */
-       rxmaxfrags = atoi(as->parms[38].items->data);
+@@ -1919,6 +1919,11 @@ mainproc(struct cmd_syndesc *as, void *arock)
+       inumcalc = strdup(as->parms[39].items->data);
      }
-+    if (as->parms[39].items) {
+ 
++    if (as->parms[40].items) {
 +      /* -exit */
 +      exit(0);
 +    }
- 
-     if (as->parms[39].items) {
-       /* -inumcalc */
-@@ -2629,6 +2633,7 @@ afsd_init(void)
++
+     /* parse cacheinfo file if this is a diskcache */
+     if (ParseCacheInfoFile()) {
+       exit(1);
+@@ -2629,6 +2634,7 @@ afsd_init(void)
                  " per Rx packet");
      cmd_AddParm(ts, "-inumcalc", CMD_SINGLE, CMD_OPTIONAL,
                "Set inode number calculation method");