Merge branch 'BenBE_work'

Conflicts:
	natives/org_cacert_gigi_natives_SetUID.c

diff --cc natives/org_cacert_gigi_natives_SetUID.c
index 96bf4c21503e09354d9f23ad3fd8e8fea200a417,2e2ef79fe8c17353ba98c374b6a692f9a66f6b4c..6c94d619a397dfdf891d25136753febe390be827
--- 1/natives/org_cacert_gigi_natives_SetUID.c
--- 2/natives/org_cacert_gigi_natives_SetUID.c
+++ b/natives/org_cacert_gigi_natives_SetUID.c
@@@ -1,36 -1,39 +1,40 @@@
- #include <jni.h>  
+ #include <jni.h>
  #include <sys/types.h>
- #include <unistd.h> 
-   
- #ifndef _Included_org_cacert_natives_SetUID  
- #define _Included_org_cacert_natives_SetUID  
- #ifdef __cplusplus  
- extern "C" {  
- #endif  
-   
- static jobject getStatus(JNIEnv *env, int successCode, const char * message) {  
-   
-    jstring message_str = (*env)->NewStringUTF(env, message);
-    jboolean success = successCode;  
-    jclass cls = (*env)->FindClass(env, "Lorg/cacert/gigi/natives/SetUID$Status;");  
-    jmethodID constructor = (*env)->GetMethodID(env, cls, "<init>", "(ZLjava/lang/String;)V");  
-    return (*env)->NewObject(env, cls, constructor, success, message_str);  
- }  
-   
- JNIEXPORT jobject JNICALL Java_org_cacert_gigi_natives_SetUID_setUid  
-   (JNIEnv *env, jobject obj, jint uid, jint gid) {  
-         if(setgid((int)gid)) {  
-          return (jobject)getStatus(env, 0, "Error while setting GID.");  
-       } 
-   
-       if(setuid((int)uid)) {
-          return (jobject)getStatus(env, 0, "Error while setting UID.");  
-       }  
-   
-       return (jobject)getStatus(env, 1, "Successfully set uid/gid.");  
- }  
-   
- #ifdef __cplusplus  
- }  
- #endif  
- #endif  
++
+ #include <unistd.h>
+ 
+ #ifndef _Included_org_cacert_natives_SetUID
+ #define _Included_org_cacert_natives_SetUID
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+ static jobject getStatus(JNIEnv *env, int successCode, const char * message) {
+     jstring message_str = (*env)->NewStringUTF(env, message);
+     jboolean success = successCode;
+     jclass cls = (*env)->FindClass(env, "Lorg/cacert/gigi/natives/SetUID$Status;");
+     jmethodID constructor = (*env)->GetMethodID(env, cls, "<init>", "(ZLjava/lang/String;)V");
+     return (*env)->NewObject(env, cls, constructor, success, message_str);
+ }
+ 
+ JNIEXPORT jobject JNICALL Java_org_cacert_gigi_natives_SetUID_setUid
+         (JNIEnv *env, jobject obj, jint uid, jint gid) {
+ 
+     /* We don't need the reference for the object/class we are working on */
+     (void)obj;
+ 
+     if(setgid((int)gid)) {
+         return (jobject)getStatus(env, 0, "Error while setting GID.");
+     }
+ 
+     if(setuid((int)uid)) {
+         return (jobject)getStatus(env, 0, "Error while setting UID.");
+     }
+ 
+     return (jobject)getStatus(env, 1, "Successfully set uid/gid.");
+ }
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ #endif