From 6bd12cb39928dfb1bade02b92e783ac52c047563 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 10 Sep 2013 20:55:46 -0400
Subject: [PATCH] kpasswd: move roken.h after config.h in kpasswd_local.h

With roken.h at the end of the include list two different versions
of Winsock get imported on Windows.  roken.h should always be
immediately after config.h if included.

Change-Id: Id3f6761028ddaa5b44183fe6648c5ab292ca8865
---
 kpasswd/kpasswd_locl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kpasswd/kpasswd_locl.h b/kpasswd/kpasswd_locl.h
index a1ed2e376..3be2096fe 100644
--- a/kpasswd/kpasswd_locl.h
+++ b/kpasswd/kpasswd_locl.h
@@ -40,6 +40,8 @@
 #include <config.h>
 #endif
 
+#include <roken.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -96,7 +98,6 @@
 #include <libutil.h>
 #endif
 #include <err.h>
-#include <roken.h>
 #include <getarg.h>
 #include <krb5.h>
 #include "crypto-headers.h" /* for des_read_pw_string */