diff -Nru globus-gridftp-server-control-0.46/debian/changelog globus-gridftp-server-control-0.46/debian/changelog
--- globus-gridftp-server-control-0.46/debian/changelog	2011-06-06 14:31:53.000000000 +0200
+++ globus-gridftp-server-control-0.46/debian/changelog	2012-07-21 03:36:23.000000000 +0200
@@ -1,3 +1,13 @@
+globus-gridftp-server-control (0.46-1ubuntu0.1) oneiric-security; urgency=low
+
+  * SECURITY UPDATE: Wrong user mapping on badly configured server
+    (LP: #1027323)
+    - debian/patches/globus-gridftp-server-control-pw195.patch: backported
+      from upstream
+    - CVE-2012-3292
+
+ -- Mattias Ellert <mattias.ellert@fysast.uu.se>  Thu, 19 Jul 2012 16:41:24 +0200
+
 globus-gridftp-server-control (0.46-1) unstable; urgency=low
 
   * Update to Globus Toolkit 5.0.4
diff -Nru globus-gridftp-server-control-0.46/debian/patches/globus-gridftp-server-control-pw195.patch globus-gridftp-server-control-0.46/debian/patches/globus-gridftp-server-control-pw195.patch
--- globus-gridftp-server-control-0.46/debian/patches/globus-gridftp-server-control-pw195.patch	1970-01-01 01:00:00.000000000 +0100
+++ globus-gridftp-server-control-0.46/debian/patches/globus-gridftp-server-control-pw195.patch	2012-05-25 19:24:24.000000000 +0200
@@ -0,0 +1,12 @@
+diff -ur globus_gridftp_server_control-2.5.orig/globus_gridftp_server_control.c globus_gridftp_server_control-2.5/globus_gridftp_server_control.c
+--- globus_gridftp_server_control-2.5.orig/globus_gridftp_server_control.c	2012-03-06 06:28:30.000000000 +0100
++++ globus_gridftp_server_control-2.5/globus_gridftp_server_control.c	2012-05-25 17:11:55.894036918 +0200
+@@ -3764,7 +3764,7 @@
+             globus_calloc(1, sizeof(globus_l_libc_cached_pwent_t));
+         rc = globus_libc_getpwuid_r(
+             uid, &pwent->pw, pwent->buffer, GSU_MAX_PW_LENGTH, &result_pw);
+-        if(rc != 0)
++        if(rc != 0 || result_pw == NULL)
+         {
+             goto error_pwent;
+         }
diff -Nru globus-gridftp-server-control-0.46/debian/patches/series globus-gridftp-server-control-0.46/debian/patches/series
--- globus-gridftp-server-control-0.46/debian/patches/series	2011-04-27 00:17:24.000000000 +0200
+++ globus-gridftp-server-control-0.46/debian/patches/series	2012-07-19 16:41:17.000000000 +0200
@@ -5,3 +5,6 @@
 # Missing direct dependencies:
 # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7165
 globus-gridftp-server-control-deps.patch
+
+# Fix for CVE-2012-3292
+globus-gridftp-server-control-pw195.patch