summaryrefslogtreecommitdiffstats
path: root/zarb-ml/mageia-sysadm/2010-December/001253.html
blob: a350bf0c779673daa1e4ab429a22eb853a6a6b46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
 <HEAD>
   <TITLE> [Mageia-sysadm] [170] - fix the keyprefix for ipv6 here too ( patch	by Maarten Vanraes )
   </TITLE>
   <LINK REL="Index" HREF="index.html" >
   <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B170%5D%20-%20fix%20the%20keyprefix%20for%20ipv6%20here%20too%20%28%20patch%0A%09by%20Maarten%20Vanraes%20%29&In-Reply-To=%3C20101216003417.5165540342%40valstar.mageia.org%3E">
   <META NAME="robots" CONTENT="index,nofollow">
   <META http-equiv="Content-Type" content="text/html; charset=us-ascii">
   <LINK REL="Previous"  HREF="001252.html">
   <LINK REL="Next"  HREF="001254.html">
 </HEAD>
 <BODY BGCOLOR="#ffffff">
   <H1>[Mageia-sysadm] [170] - fix the keyprefix for ipv6 here too ( patch	by Maarten Vanraes )</H1>
    <B>root at mageia.org</B> 
    <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B170%5D%20-%20fix%20the%20keyprefix%20for%20ipv6%20here%20too%20%28%20patch%0A%09by%20Maarten%20Vanraes%20%29&In-Reply-To=%3C20101216003417.5165540342%40valstar.mageia.org%3E"
       TITLE="[Mageia-sysadm] [170] - fix the keyprefix for ipv6 here too ( patch	by Maarten Vanraes )">root at mageia.org
       </A><BR>
    <I>Thu Dec 16 01:34:17 CET 2010</I>
    <P><UL>
        <LI>Previous message: <A HREF="001252.html">[Mageia-sysadm] [169] add ipv6 support by default ( at least as example on how to do it ), patch by Maarten Vanraes
</A></li>
        <LI>Next message: <A HREF="001254.html">[Mageia-sysadm] [171] - add a TODO to merge the code with user.pm
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1253">[ date ]</a>
              <a href="thread.html#1253">[ thread ]</a>
              <a href="subject.html#1253">[ subject ]</a>
              <a href="author.html#1253">[ author ]</a>
         </LI>
       </UL>
    <HR>  
<!--beginarticle-->
<PRE>Revision: 170
Author:   misc
Date:     2010-12-16 01:34:17 +0100 (Thu, 16 Dec 2010)
Log Message:
-----------
- fix the keyprefix for ipv6 here too ( patch by Maarten Vanraes )

Modified Paths:
--------------
    identity/CatDap/trunk/lib/CatDap/Controller/admin.pm

Modified: identity/CatDap/trunk/lib/CatDap/Controller/admin.pm
===================================================================
--- identity/CatDap/trunk/lib/CatDap/Controller/admin.pm	2010-12-16 00:33:50 UTC (rev 169)
+++ identity/CatDap/trunk/lib/CatDap/Controller/admin.pm	2010-12-16 00:34:17 UTC (rev 170)
@@ -47,7 +47,15 @@
     my $password;
     my $mesg;
     my $dn;
-    my $keyprefix = sprintf( &quot;%02x%02x%02x&quot;, split /\./, $c-&gt;req-&gt;address );
+    my $keyprefix;
+    if ($c-&gt;req-&gt;address =~ m/:/) {
+        my $address = $c-&gt;req-&gt;address;
+        $address =~ s/\[\]://;
+        $keyprefix = sprintf( &quot;%06x&quot;, $address &gt;&gt; 104 ); # if we shift right 104 bits from 128 we have 24 bits left or 3 bytes.
+    }
+    else {
+        $keyprefix = sprintf( &quot;%02x%02x%02x&quot;, split /\./, $c-&gt;req-&gt;address );
+    }
     if ( !defined $c-&gt;user or not $c-&gt;req-&gt;cookie('key') ) {
         $c-&gt;detach('/user/login')
           if ( not $c-&gt;req-&gt;param('username')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: &lt;/pipermail/mageia-sysadm/attachments/20101216/1af6ab62/attachment.html&gt;
</PRE>



<!--endarticle-->
    <HR>
    <P><UL>
        <!--threads-->
	<LI>Previous message: <A HREF="001252.html">[Mageia-sysadm] [169] add ipv6 support by default ( at least as example on how to do it ), patch by Maarten Vanraes
</A></li>
	<LI>Next message: <A HREF="001254.html">[Mageia-sysadm] [171] - add a TODO to merge the code with user.pm
</A></li>
         <LI> <B>Messages sorted by:</B> 
              <a href="date.html#1253">[ date ]</a>
              <a href="thread.html#1253">[ thread ]</a>
              <a href="subject.html#1253">[ subject ]</a>
              <a href="author.html#1253">[ author ]</a>
         </LI>
       </UL>

<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>