Re-alphabetise one char expansions

diff --git a/src/main/xlat.c b/src/main/xlat.c
index c281e7fcb8492cc4101c5b5ee914361ab684efcf..f302a76edcf653476b8ef840a26bc4b2f184948c 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -1287,12 +1287,6 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                q += valuepair2str(q,freespace,pairfind(request->reply->vps,PW_FRAMED_IP_ADDRESS, 0),PW_TYPE_IPADDR, func);
                                p++;
                                break;
-                       case 'I': /* Request ID */
-                               snprintf(tmpdt, sizeof(tmpdt), "%i", request->packet->id);
-                               strlcpy(q, tmpdt, freespace);
-                               q += strlen(q);
-                               p++;
-                               break;
                        case 'i': /* Calling station ID */
                                q += valuepair2str(q,freespace,pairfind(request->packet->vps,PW_CALLING_STATION_ID, 0),PW_TYPE_STRING, func);
                                p++;
@@ -1356,24 +1350,30 @@ int radius_xlat(char *out, int outlen, const char *fmt,
                                }
                                p++;
                                break;
-                       case 'H': /* request hour */
+                       case 'G': /* request minute */
                                TM = localtime_r(&request->timestamp, &s_TM);
-                               len = strftime(tmpdt, sizeof(tmpdt), "%H", TM);
+                               len = strftime(tmpdt, sizeof(tmpdt), "%M", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
                                        q += strlen(q);
                                }
                                p++;
                                break;
-                       case 'G': /* request minute. main purpose is detail log files by minute. place %H%G in detail filename */
+                       case 'H': /* request hour */
                                TM = localtime_r(&request->timestamp, &s_TM);
-                               len = strftime(tmpdt, sizeof(tmpdt), "%M", TM);
+                               len = strftime(tmpdt, sizeof(tmpdt), "%H", TM);
                                if (len > 0) {
                                        strlcpy(q, tmpdt, freespace);
                                        q += strlen(q);
                                }
                                p++;
                                break;
+                       case 'I': /* Request ID */
+                               snprintf(tmpdt, sizeof(tmpdt), "%i", request->packet->id);
+                               strlcpy(q, tmpdt, freespace);
+                               q += strlen(q);
+                               p++;
+                               break;
                        case 'L': /* radlog_dir */
                                strlcpy(q,radlog_dir,freespace);
                                q += strlen(q);